From 49ff719831f9f251044c9b60ffab66c5c467c61b Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期四, 13 四月 2023 10:40:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 31 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html | 2
WebTM/views/user/login.html | 9
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 28 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 82 ++++++-
WebTM/views/index_Mobile_QiaoYi.html | 44 ++--
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 101 ++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillEdit.html | 107 ++++++++-
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html | 109 ++++++++-
WebTM/views/userfiles/images/pda.jpg | 0
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 3
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html | 96 ++++++++
WebTM/views/index.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillList.html | 2
WebTM/WebTM.csproj | 2
16 files changed, 509 insertions(+), 111 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d8b2cfd..9b76018 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,8 +184,8 @@
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
- <Content Include="views\userfiles\images\loginBackground-New.jpg" />
<Content Include="views\userfiles\images\pda.jpg" />
+ <Content Include="views\userfiles\images\loginBackground-New.jpg" />
<Content Include="views\userfiles\images\wy.jpg" />
<Content Include="views\user\login_anrui.html" />
<Content Include="views\user\login2.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 64a7286..d0626fe 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1168,7 +1168,7 @@
//鍊掕鏃跺叧闂�
timer = setTimeout(function () {
$("#LAY_app_flexible").click();
- }, 3000);
+ }, 10);
}
}
diff --git a/WebTM/views/index_Mobile_QiaoYi.html b/WebTM/views/index_Mobile_QiaoYi.html
index de5a972..d8a7b35 100644
--- a/WebTM/views/index_Mobile_QiaoYi.html
+++ b/WebTM/views/index_Mobile_QiaoYi.html
@@ -107,7 +107,7 @@
宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
</a>
</dd>-->
- <dd>
+ <!--<dd>
<a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭濮斿鍙戝嚭鍗�
@@ -142,7 +142,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
浜х嚎鍏抽敭浠剁粦瀹�
</a>
- </dd>
+ </dd>-->
<!--<dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -305,7 +305,7 @@
<cite>浠撳偍鏉＄爜绠＄悊</cite>
</a>
<dl class="layui-nav-child">
- <dd>
+ <!--<dd>
<a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閲囪喘鍏ュ簱
@@ -322,7 +322,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇鍏ュ簱
</a>
- </dd>
+ </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;" />
@@ -335,7 +335,7 @@
鍏朵粬鍏ュ簱锛堢孩瀛楋級
</a>
</dd>-->
- <dd>
+ <!--<dd>
<a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇棰嗘枡
@@ -362,18 +362,18 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閿�鍞嚭搴撴牎楠�
</a>
- </dd>
+ </dd>-->
<dd>
<a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鍏朵粬鍑哄簱
</a>
- <a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;">
+ <!--<a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鍏朵粬鍑哄簱鏍￠獙
- </a>
+ </a>-->
</dd>
- <dd>
+ <!--<dd>
<a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇琛ユ枡鏍￠獙
@@ -384,7 +384,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
濮斿琛ユ枡鏍￠獙
</a>
- </dd>
+ </dd>-->
<dd>
<a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -397,7 +397,7 @@
鍒嗘寮忚皟鍏
</a>
</dd>-->
- <dd>
+ <!--<dd>
<a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鍒嗘寮忚皟鍑�
@@ -420,8 +420,8 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇閫�鏂�
</a>
- </dd>
- <dd>
+ </dd>-->
+ <!--<dd>
<a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閿�鍞��璐�
@@ -450,23 +450,23 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇姹囨姤鍗�
</a>
- </dd>
+ </dd>-->
<!--<dd>
<a href="" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鏉＄爜鏌ヨn
</a>
</dd>-->
- <dd>
+ <!--<dd>
<a href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.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>-->
</dl>
</li>
<!-- 璁惧绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
<img src="../layuiadmin/myicon/杞﹂棿绠＄悊.svg" alt="杞﹂棿绠＄悊" style="width:25px;height:25px;margin-right: 5px;" />
<cite>璁惧绠＄悊</cite>
@@ -497,7 +497,7 @@
</a>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 缂撳瓨鍒楄〃 -->
<li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
@@ -505,7 +505,7 @@
<cite>缂撳瓨鍒楄〃</cite>
</a>
<dl class="layui-nav-child">
- <dd>
+ <!--<dd>
<a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閲囪喘鍏ュ簱缂撳瓨鍒楄〃
@@ -534,7 +534,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
</a>
- </dd>
+ </dd>-->
<dd>
<a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -547,7 +547,7 @@
鍏朵粬鍑哄簱缂撳瓨鍒楄〃
</a>
</dd>
- <dd>
+ <!--<dd>
<a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
濮斿鍏ュ簱缂撳瓨鍒楄〃
@@ -576,7 +576,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
濮斿琛ユ枡鏍￠獙缂撳瓨鍒楄〃
</a>
- </dd>
+ </dd>-->
<dd>
<a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 6dc8a69..5f08a3f 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -21,7 +21,7 @@
<!--<audio id="cs" hidden controls>
<source src="../video/jingbao.wav" type="audio/ogg">
</audio>-->
- <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;background-image:url(../userfiles/images/2.jpg);background-size: 100%;">
+ <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
<div class="layadmin-user-login-main" style="margin: -5.8% auto;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<h2 style="color:white;">L-MES</h2>
@@ -137,8 +137,11 @@
var judgeMorPCflag = judgeMorPC();
if (!judgeMorPCflag) {//绉诲姩绔�
-
- $("#LAY-user-login").css("background", "url('../userfiles/images/pda.jpg')");
+ $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+ $("#LAY-user-login").css("background-size", "100%");
+ } else {
+ $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+ $("#LAY-user-login").css("background-size", "100%");
}
//鎻愪氦
diff --git a/WebTM/views/userfiles/images/pda.jpg b/WebTM/views/userfiles/images/pda.jpg
index 3563fa5..f201fb3 100644
--- a/WebTM/views/userfiles/images/pda.jpg
+++ b/WebTM/views/userfiles/images/pda.jpg
Binary files differ
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 5733ab0..fe78ae2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -106,7 +106,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline" style="">
- <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" autocomplete="off" value="0">
+ <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
@@ -131,13 +131,17 @@
<div class="layui-inline">
<label class="layui-form-label">骞呭</label>
<div class="layui-input-inline" style="">
- <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" autocomplete="off" value="0">
+ <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
+ <input type="text" readonly name="HMaterClsName" id="HMaterClsName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HMaterClsID" id="HMaterClsID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMaterClsID" id="btnHMaterClsID" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
@@ -510,6 +514,7 @@
if (hID == null || hID == 0) {
//id new
$("#HItemID").val(0);
+ get_ReadConfigFile();
}
else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
@@ -598,6 +603,32 @@
});
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("Add_Edit_Gy_Material");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#HWhID").val(data2["HWhID"]);
+ $("#HWhName").val(data2["HWhName"]);
+ $("#HMaterTypeID").val(data2["HMaterTypeID"]);
+ form.render('select');
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("Add_Edit_Gy_Material");
+ var data = {
+ HWhID: $("#HWhID").val()
+ , HWhName: $("#HWhName").val()
+ , HMaterTypeID: $("#HMaterTypeID").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
+ }
+
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
function RoadBillMain(hID)//鍔犺浇琛ㄥご
@@ -633,7 +664,8 @@
, "HSubjoin": data.闄勫姞灞炴��1
, "HSubjoin2": data.闄勫姞灞炴��2
, "HColor": data.棰滆壊
- , "HMaterClsID": data.鐗╂枡鍒嗙被
+ , "HMaterClsID": data.HMaterClsID
+ , "HMaterClsName": data.鐗╂枡鍒嗙被
, "HMaterTypeID": data.鐗╂枡灞炴�� == "0" ? 1 : data.鐗╂枡灞炴��
, "HWhID": data.榛樿浠撳簱
, "HWhName": data.浠撳簱鍚嶇О
@@ -701,20 +733,43 @@
//var sSubStr = JSON.stringify(table.cache['mainTable']);
//var sMainSub = sMainStr + ';' + sSubStr;
if ($("#HNumber").val() == 0) {
- layer.msg("璇烽�夋嫨鐗╂枡浠ｇ爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇疯緭鍏ョ墿鏂欎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
if ($("#HName").val() == 0) {
- layer.msg("璇烽�夋嫨鐗╂枡鍚嶇О锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇疯緭鍏ョ墿鏂欏悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
if ($("#HModel").val() == 0) {
- layer.msg("璇烽�夋嫨瑙勬牸鍨嬪彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇疯緭鍏ヨ鏍煎瀷鍙凤紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
if ($("#HUnitName").val() == 0) {
layer.msg("璇烽�夋嫨涓昏閲忓崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
+ }
+ var HWeight = $('#HWeight').val();
+ if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
+ layer.msg("鍏嬮噸鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWeight)) {
+ layer.msg("鍏嬮噸璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HWidth = $('#HWidth').val();
+ if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
+ layer.msg("骞呭鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWidth)) {
+ layer.msg("骞呭璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
}
//if ($("#HUnitGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -748,6 +803,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ get_WriteConfigFile();
}
else {
@@ -812,6 +868,37 @@
, btn2: function (index, layero) { }
})
});
+
+ //閫夋嫨鐗╂枡鍒嗙被
+ form.on('submit(btnHMaterClsID)', function () {
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒嗙被鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ $("#HMaterClsName").val(checkStatus.data[0].鍚嶇О);
+ $("#HMaterClsID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+
//閫夋嫨杈呭姪璁￠噺鍗曚綅
form.on('submit(HSecUnitList)', function () {//閫夋嫨瀹胯垗
$("#UnitType").val(2);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index 23db39e..d124981 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鐢熶骇璁㈠崟鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸,a.娴佽浆鍗℃暟閲� 鐢熶骇鏁伴噺,a.鍗曟嵁鍙� + '&' + ltrim(b.HEntryID) 鏉＄爜缂栧彿 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
+ SqlXMLReportData.GenEntireData(this, "select b.娴佹按鍙�,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.澶囨敞2,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] +"order by cast(b.娴佹按鍙� as int)","select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 5e6cc54..ddcb0b8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -190,7 +190,7 @@
<option value="1">璁″垝</option>
<option value="2">璁″垝纭</option>
<option value="3">涓嬭揪</option>
- <option value="4">寮�宸�</option>
+ <option value="4" selected>寮�宸�</option>
<option value="5">瀹屽伐</option>
<option value="6">缁撴</option>
<option value="7">缁撶畻</option>
@@ -743,6 +743,7 @@
$("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
$("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
$("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
+ $("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1235,6 +1236,31 @@
return false;
}
+
+ var HQty = $('#HQty').val();
+ if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+ layer.msg("璁″垝鐢熶骇鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HQty)) {
+ layer.msg("璁″垝鐢熶骇鏁伴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HAuxQty = $('#HAuxQty').val();
+ if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+ layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HAuxQty)) {
+ layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
//if ($("#HDeptName").val() == "") {
// layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
// return false;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
index fdffcf0..d5614cd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
@@ -620,7 +620,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+ location.replace('MES_StationInBill_PDA_QiaoYi.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
}
//#endregion
@@ -1092,6 +1092,7 @@
data: data1.data,
//, cellMinWidth: 80
//toolbar: '#toolbarDemo'
+ limit: 50,
cols: [[
{ field: '娴佹按鍙�', title: '娴佹按鍙�' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
index a5550e9..23f5f8a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
@@ -149,7 +149,7 @@
<tr>
<th>褰撳墠宸ュ簭</th>
<td class="bz_td">
- <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
@@ -164,7 +164,7 @@
<tr>
<th>鍚堟牸鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;height:55px">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;">
</td>
</tr>
<tr>
@@ -184,14 +184,14 @@
<tr>
<th>浜у搧鍚嶇О</th>
<td class="bz_td">
- <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
<th>瑙勬牸鍨嬪彿</th>
<td class="bz_td">
- <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
@@ -270,14 +270,14 @@
<tr>
<th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+ <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
</td>
</tr>
<tr>
<th>鎶ュ簾鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px">
+ <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;">
</td>
</tr>
<tr>
@@ -806,8 +806,9 @@
elem: '#mainTable',
url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
//, cellMinWidth: 80
- toolbar: '#toolbarDemo'
- , where: { HProcExchHinteID: HProcExchHinteID }
+ //toolbar: '#toolbarDemo'
+ where: { HProcExchHinteID: HProcExchHinteID }
+ ,limit: 50
, cols: [[
{ field: '娴佹按鍙�', title: '娴佹按鍙�' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
@@ -1412,13 +1413,13 @@
}
});
- //if (data.Verify == "Y") {
- // location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
- //}
- //else {
- // //淇濆瓨鍚庢祻瑙�
- // ReRoadBillMain();
- //}
+ if (data.Verify == "Y") {
+ location.replace('MES_StationOutBill_PDA_QiaoYi.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ }
+ else {
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
index 160e697..440e4a7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
@@ -466,20 +466,100 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index];
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- obj.update({
- HProcName: checkStatus.data[0].宸ュ簭
- , HProcID: checkStatus.data[0].HItemID
- , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+
+ //鑾峰彇宸ュ簭浠ｇ爜
+ var ProcessNumber = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠ｇ爜"] + "'");
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+ NowNum = i + 1;
+ }
+ }
+
+ //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+ var WorkCente = [];
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HNumber 宸ュ簭浠ｇ爜 from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ WorkCente = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
});
+
+
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠ｇ爜"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length + 1 + i, "HProcID": WorkCente[j]["HProcID"], "HProcNumber": WorkCente[j]["宸ュ簭浠ｇ爜"], "HProcName": WorkCente[j]["宸ュ簭鍚嶇О"], "HWorkRemark": "",
+ "HCenterID": WorkCente[j]["HCenterID"], "HCenterNumber": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterName": WorkCente[j]["宸ヤ綔涓績鍚嶇О"],
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+ "HQty": $("#HQty").val(), "HRemark": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+ option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠ｇ爜"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+ }
+
+ table.render(option);
+ //obj.update({
+ // HProcName: checkStatus.data[0].宸ュ簭
+ // , HProcID: checkStatus.data[0].HItemID
+ // , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ //});
layer.close(layer.index);
}
@@ -494,7 +574,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鍔犲伐涓績鍒楄〃',
+ title: '宸ヤ腑蹇冨垪琛�',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
@@ -864,12 +944,13 @@
layer.msg("绗�" + (i + 1) + "琛�:渚涘簲鍟嗕笉鑳戒负绌�!");
return false;
}
- } else {
- if (option.data[i]["HCenterID"] == "0") {
- layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
- return false;
- }
}
+ //else {
+ // if (option.data[i]["HCenterID"] == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
+ // return false;
+ // }
+ //}
if (parseInt(option.data[i].HQty) > parseInt($("#HQty").val())) {
var indexRow = i + 1;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
index 65dd184..83c150f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
@@ -138,7 +138,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍒跺崟浜�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
+ var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
var option = [];
var HModName = "Sc_ProcExchRecordBackBillList";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
index 1439a70..47df405 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
@@ -465,20 +465,100 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index];
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- obj.update({
- HProcName: checkStatus.data[0].宸ュ簭
- , HProcID: checkStatus.data[0].HItemID
- , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+
+ //鑾峰彇宸ュ簭浠ｇ爜
+ var ProcessNumber = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠ｇ爜"] + "'");
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+ NowNum = i + 1;
+ }
+ }
+
+ //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+ var WorkCente = [];
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HNumber 宸ュ簭浠ｇ爜 from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ WorkCente = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
});
+
+
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠ｇ爜"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length + 1 + i, "HProcID": WorkCente[j]["HProcID"], "HProcNumber": WorkCente[j]["宸ュ簭浠ｇ爜"], "HProcName": WorkCente[j]["宸ュ簭鍚嶇О"], "HWorkRemark": "",
+ "HCenterID": WorkCente[j]["HCenterID"], "HCenterNumber": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterName": WorkCente[j]["宸ヤ綔涓績鍚嶇О"],
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+ "HQty": $("#HQty").val(), "HRemark": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+ option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠ｇ爜"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+ }
+
+ table.render(option);
+ //obj.update({
+ // HProcName: checkStatus.data[0].宸ュ簭
+ // , HProcID: checkStatus.data[0].HItemID
+ // , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ //});
layer.close(layer.index);
}
@@ -493,7 +573,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鍔犲伐涓績鍒楄〃',
+ title: '宸ヤ腑蹇冨垪琛�',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
index b426654..43e5413 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
@@ -136,7 +136,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍒跺崟浜�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
+ var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠ｇ爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
var option = [];
var HModName = "Sc_ProcExchWorkBackBillList";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 0d6c621..c50da7c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -247,31 +247,45 @@
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鍘熷洜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鏍囪</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCusNames" id="HCusNames" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HCusID" id="HCusID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs6 layui-inline">
<label class="layui-form-label" style="width:12.5%">澶囨敞</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
</div>
</div>
-
-
</div>
<div class="layui-row">
<div class="layui-col-xs6 layui-inline">
@@ -316,7 +330,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍧忓竷瀵嗗害</label>
+ <label class="layui-form-label" style="width: 85px;">鍧竷瀵嗗害</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDensity" id="HDensity">
</div>
@@ -488,7 +502,7 @@
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐗堟湰</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
@@ -499,7 +513,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鑺綋鐗╂枡浠ｇ爜</label>
<div class="layui-input-inline">
@@ -1725,6 +1739,33 @@
layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+ var HAuxQty = $('#HAuxQty').val();
+ if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+ layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HAuxQty)) {
+ layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HSplitNo = $('#HSplitNo').val();
+ if (HSplitNo.substring(HSplitNo.length - 1, HSplitNo.length) == ".") {
+ layer.msg("鎷嗗垎鍙风殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSplitNo)) {
+ layer.msg("鎷嗗垎鍙疯杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+
+
//鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
var sSubTable = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -1978,6 +2019,10 @@
, "HSplitNo": data.鎷嗗垎鍙�
, "HRemark2": data.澶囨敞2
, "HRemark3": data.搴曢儴澶囨敞
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HCusID": data.HCusID
+ , "HCusNames": data.瀹㈡埛
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
@@ -2035,7 +2080,7 @@
, "HHeight": data.姣涢珮
, "HInches": data.瀵告暟缁勭粐
, "HAl1Long": data.鍏ㄦ瘺闀�
- , "HDensity": data.鍧忓竷瀵嗗害
+ , "HDensity": data.鍧竷瀵嗗害
, "HTela": data.姣涚罕鍚嶇О鍙婅鏍�
, "HUnderTela": data.搴曚笣
, "HSizing": data.瀹氬瀷娴嗘枡
@@ -2307,6 +2352,11 @@
$("#HWeight").val(data.HWeight);
$("#HAuxUnitName").val(data.HAuxUnitName);
$("#HAuxUnit").val(data.HAuxUnit);
+ $("#HRemark2").val(data.澶囨敞);
+ $("#HEmpID").val(data.HEmpID);
+ $("#HEmpName").val(data.涓氬姟鍛�);
+ $("#HCusID").val(data.HCusID);
+ $("#HCusNames").val(data.瀹㈡埛);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index 606a18c..934666a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -121,7 +121,8 @@
, table = layui.table
, form = layui.form
, element = layui.element;
- var sBillType = '1206'
+ var sBillType = '1206';
+ var option = [];
//娓呯┖鐣岄潰 new
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -338,25 +339,93 @@
})
});
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
+ //table.render({
+ // elem: '#dj-table'
+ // , url: GetWEBURL() + '/Web/chanpinruk'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ // , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ // , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ // , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+ // , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //})
+
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Web/chanpinruk1",
+ type: "GET",
+ async: false,
+ data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
+ //async: false,
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ } else {
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ ]]
+ , data:[]
+ };
+ table.render(option);
+ }
}
})
--
Gitblit v1.9.1