From cc60441578ce0c1fcb4a344a11c2e8616a9b13ec Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 11 七月 2022 10:17:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 70 +--
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html | 7
WebTM/views/仓存管理/条码出入库记录表/KF_PonderationBillList_Query.html | 401 +++++++++++++++++++++++
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 1
WebTM/views/index_Mobile.html | 12
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 20
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 7
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 12
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html | 12
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 6
WebTM/views/index.html | 29 +
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 18
WebTM/WebTM.csproj.user | 2
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 230 ++++++------
WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html | 2
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 12
WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 14
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html | 14
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html | 14
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Check.html | 12
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 54 +-
WebTM/views/验收入库/其他入库/Kf_RedOtherInBill_Fast.html | 2
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 12
WebTM/views/验收入库/产品入库/Kf_ProductInBackBill.html | 14
WebTM/WebTM.csproj | 1
27 files changed, 710 insertions(+), 271 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 16ca0a0..677b625 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -150,6 +150,7 @@
<Content Include="views\浠撳瓨绠＄悊\濮斿鐢ㄦ枡鍗昞WW_PPBomBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍琛╘KF_PonderationBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰曡〃\Kf_ICStockBillSubList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰曡〃\KF_PonderationBillList_Query.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryByMaterID.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMS.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 87674ea..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index ed0636b..97b8b50 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -83,7 +83,6 @@
<dl class="layui-nav-child">
<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
- <hr>
<dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
@@ -236,12 +235,22 @@
</dl>
</dd>
<dd>
+ <a>缂撳瓨鍒楄〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">鍏朵粬鍑哄簱鍗曠紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">璋冩嫧鍗曠紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd>
+ </dl>
+ </dd>
+ <dd>
<a>浠撳簱鎶ヨ〃</a>
<dl class="layui-nav-child">
<dd><a lay-href="浠撳瓨绠＄悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/Kf_ICStockBillSubList.html">鏉＄爜鍑哄叆搴撹褰曡〃</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryList_WMS.html">鏉＄爜搴撳瓨鏌ヨ</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉＄爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
@@ -373,8 +382,8 @@
<a>鏃ヨ鍒掑伐鍗�</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
- </dl>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+ </dl>
</dd>
<dd>
<a>瑕佹枡璁″垝</a>
@@ -415,7 +424,7 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 杞﹂棿绠＄悊 -->
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠＄悊</cite></a>
@@ -547,7 +556,7 @@
</dd>
</dl>
</li>
- <!-- 鍣ㄥ叿绠＄悊 -->
+ 鍣ㄥ叿绠＄悊
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>鍣ㄥ叿绠＄悊</cite></a>
<dl class="layui-nav-child">
@@ -640,7 +649,7 @@
</dd>
</dl>
</li>
- <!-- 璁惧绠＄悊 -->
+ 璁惧绠＄悊
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>璁惧绠＄悊</cite></a>
<dl class="layui-nav-child">
@@ -690,7 +699,7 @@
</dd>
</dl>
</li>
- <!-- 宸ヨ祫绠＄悊 -->
+ 宸ヨ祫绠＄悊
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>宸ヨ祫绠＄悊</cite></a>
<dl class="layui-nav-child">
@@ -764,7 +773,7 @@
</dl>
</li>
<!-- 鍙鍖栫湅鏉� -->
- <li data-name="template" class="layui-nav-item">
+ <!--<li data-name="template" class="layui-nav-item">
<a href="javascript:;" lay-tips="鍙鍖栫湅鏉�" lay-direction="2">
<i class="layui-icon layui-icon-chart-screen"></i>
<cite>鍙鍖栫湅鏉�</cite>
@@ -856,8 +865,8 @@
</a>
</dd>
</dl>
- </li>
- <!-- 鍩虹寤烘ā -->
+ </li>-->
+ <!--鍩虹寤烘ā-->
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>鍩虹寤烘ā</cite></a>
<dl class="layui-nav-child">
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 466e592..54ec103 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -77,7 +77,7 @@
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260p x;">
<!-- 杞﹂棿绠＄悊 -->
- <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>
@@ -156,9 +156,9 @@
</a>
</dd>
</dl>
- </li>
+ </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>
@@ -279,7 +279,7 @@
</a>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 浠撳偍鏉＄爜绠＄悊 -->
<li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
@@ -432,7 +432,7 @@
</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>
@@ -463,7 +463,7 @@
</a>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 缂撳瓨鍒楄〃 -->
<li data-name="set" class="layui-nav-item">
<a style="padding-left:20px;">
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 16bde89..acea92c 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -495,7 +495,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1207' },
success: function (d) {
@@ -870,7 +870,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm("鐢熸垚璋冩嫧鍗�" + data.Message + $("#HBillNo").val(), {
+ layer.confirm(data.Message , {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
btn2: function () {
//parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
@@ -1066,12 +1066,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -1259,12 +1260,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
index 49211f7..535deae 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
@@ -446,7 +446,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1250' },
success: function (d) {
@@ -992,12 +992,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1250', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -1159,12 +1160,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1250', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/KF_PonderationBillList_Query.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/KF_PonderationBillList_Query.html"
new file mode 100644
index 0000000..a2fd30f
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/KF_PonderationBillList_Query.html"
@@ -0,0 +1,401 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鎵爜璁板綍缂撳瓨鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎻愪氦鏍囪</label>
+ <div class="layui-input-block">
+ <select name="HRelationInterID" id="HRelationInterID" lay-verify="required" lay-search class="layui-input">
+ <option value="0" selected>鍏ㄩ儴</option>
+ <option value="鏈彁浜�">鏈彁浜�</option>
+ <option value="宸叉彁浜�">宸叉彁浜�</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNum" id="HMaterNum" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel" style="width:190px;">
+ </div>
+ </div>
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撲綅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSCWHName" id="HSCWHName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冨嚭浠撲綅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOutStockPlaceName" id="HOutStockPlaceName" style="width:190px;">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵樻潯鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode_Pack" id="HBarCode_Pack" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵规</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">MTO鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMTONo" id="HMTONo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">搴撳瓨缁勭粐</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limits: [50, 500, 5000, 20000]
+ ,limit: 50
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 110 }
+ , { field: '杈呭姪鏁伴噺', title: '杈呭姪鏁伴噺', width: 110 }
+ , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 110 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 110 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 125 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125 }
+ , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125 }
+ , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 125 }
+ , { field: '鎵樻潯鐮�', title: '鎵樻潯鐮�', width: 125 }
+ , { field: '鎵规', title: '鎵规', width: 125 }
+ , { field: 'MTO鍙�', title: 'MTO鍙�', width: 125 }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 125 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, hide: true }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
+ , { field: '鐝粍', title: '鐝粍', width: 125 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鎻愪氦鏍囪', title: '鎻愪氦鏍囪', width: 125 }
+ , { field: '绾㈣摑瀛楁爣璁�', title: '绾㈣摑瀛楁爣璁�', width: 125 }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
+ , { field: '璐т富', title: '璐т富', width: 125 }
+ , { field: '鍏朵粬缁勭粐', title: '鍏朵粬缁勭粐', width: 125 }
+ , { field: '瀹㈡埛鏍囩', title: '瀹㈡埛鏍囩', width: 125 }
+ ]]
+ };
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_ICStockInOutBill/GetKF_PonderationBillMain_Temp',
+ type: "GET",
+ data: { "sWhere": sWhere},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HMaterNum = $("#HMaterNum").val();//鐗╂枡浠ｇ爜
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+ var HWhName = $("#HWhName").val();//浠撳簱
+ var HStockPlaceName = $("#HStockPlaceName").val();//浠撲綅
+ var HSCWHName = $("#HSCWHName").val();//璋冨嚭浠撳簱
+ var HOutStockPlaceName = $("#HOutStockPlaceName").val();//璋冨嚭浠撲綅
+ var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+ var HBarCode_Pack = $("#HBarCode_Pack").val();//鎵樻潯鐮�
+ var HBatchNo = $("#HBatchNo").val();//鎵瑰彿
+ var HMTONo = $("#HMTONo").val();//MTO
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+ var HMaker = $("#HMaker").val();//鍒跺崟浜�
+ var HStockOrgName = $("#HStockOrgName").val();//搴撳瓨缁勭粐
+ var HRelationInterID = $("#HRelationInterID").val();//搴撳瓨缁勭粐
+
+
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HMaterNum) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNum + "%'";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ }
+ if (HWhName) {
+ sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HStockPlaceName) {
+ sWhere += " and 浠撲綅 like '%" + HStockPlaceName + "%'";
+ }
+ if (HSCWHName) {
+ sWhere += " and 璋冨嚭浠撳簱 like '%" + HSCWHName + "%'";
+ }
+ if (HOutStockPlaceName) {
+ sWhere += " and 璋冨嚭浠撲綅 like '%" + HOutStockPlaceName + "%'";
+ }
+ if (HBarCode) {
+ sWhere += " and 鏉″舰鐮� like '%" + HBarCode + "%'";
+ }
+ if (HBarCode_Pack) {
+ sWhere += " and 鎵樻潯鐮� like '%" + HBarCode_Pack + "%'";
+ }
+ if (HBatchNo) {
+ sWhere += " and 鎵规 like '%" + HBatchNo + "%'";
+ }
+ if (HMTONo) {
+ sWhere += " and MTO鍙� like '%" + HMTONo + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍙� like '%" + HSourceBillNo + "%'";
+ }
+ if (HMaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+ }
+ if (HRelationInterID && HRelationInterID != 0) {
+ sWhere += " and 鎻愪氦鏍囪 like '%" + HRelationInterID + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";
+ }
+ //#endregion
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBillNo").val("");//鍗曟嵁绫诲瀷
+ $("#HMaterNum").val("");//鏉＄爜
+ $("#HMaterName").val("");//鍗曟嵁鍙�
+ $("#HModel").val("");//鍗曟嵁鍙�
+ $("#HWhName").val("");//鍗曟嵁鍙�
+ $("#HStockPlaceName").val("");//鍗曟嵁鍙�
+ $("#HOutStockPlaceName").val("");//鍗曟嵁鍙�
+ $("#HBarCode").val("");//鍗曟嵁鍙�
+ $("#HBarCode_Pack").val("");//鍗曟嵁鍙�
+ $("#HBatchNo").val("");//鍗曟嵁鍙�
+ $("#HMTONo").val("");//鍗曟嵁鍙�
+ $("#HSourceBillNo").val("");//鍗曟嵁鍙�
+ $("#HMaker").val("");//鍗曟嵁鍙�
+ $("#HStockOrgName").val("");//鍗曟嵁鍙�
+ $('#HRelationInterID').val("");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
index 656b0b1..13e8409 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
@@ -102,7 +102,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">鑱屽憳</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -113,27 +113,27 @@
</div>
</div>
<!--<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
- <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
- <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
- <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
- </select>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
- </div>
- </div>
- </div>-->
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
+ <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
+ <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
+ <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>
+ </div>
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷</label>
@@ -157,6 +157,15 @@
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
</div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎬婚噾棰�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSumMoney" id="HSumMoney" readonly class="layui-input" value="" style="float:left;width:150px;">
+ </div>
+ </div>
+
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -722,6 +731,7 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HSumMoney": data.鎬婚噾棰�
});
} else {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index be5248b..fcc060d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -159,6 +159,7 @@
, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
, { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+ , { field: '鎬婚噾棰�', title: '鎬婚噾棰�', width: 125 }
, { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
//, { field: '宸ヨ祫浠ｇ爜', title: '宸ヨ祫浠ｇ爜', width: 180 }
, { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 201799d..3695598 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -1168,6 +1168,7 @@
//$("#HSPGroupID").val(d.data[0].HSPGroupID);
$("#HSPID").val(d.data[0].HSPID);
$("#HSPName").val(d.data[0].榛樿浠撲綅);
+ $("#HBarCode").var(d.data[0].鏉＄爜缂栧彿);
//$("#HInitDesignLife").val(d.data[0].HInitDesignLife);
//$("#HInitModel").val(d.data[0].HInitModel);
$("#HDesignLife").val(d.data[0].鍒濆璁捐瀵垮懡);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
index cb94778..12f8b79 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
@@ -305,7 +305,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3784' },
success: function (d) {
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_ICMOReportBill_FastNew.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_ICMOReportBill_FastNew.html"
index f8f7dc4..e25f4bb 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_ICMOReportBill_FastNew.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_ICMOReportBill_FastNew.html"
@@ -366,7 +366,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3711' },
success: function (d) {
@@ -816,11 +816,12 @@
elem: '#wl-table'
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
, where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
- , cellMinWidth : 115
+ , cellMinWidth: 115
+ , totalRow: true
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
@@ -881,14 +882,15 @@
table.render({
elem: '#wl-table'
, cellMinWidth: 80
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
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_Check.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_Check.html"
index 8e52e76..c59cbd7 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_Check.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_Check.html"
@@ -290,7 +290,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
//url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
type: "GET",
data: { "HBillType": '1201' },
@@ -848,12 +848,13 @@
var listOption = {
elem: '#wl-table'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
, { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -901,14 +902,15 @@
table.render({
elem: '#wl-table'
, cellMinWidth: 80
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
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_Fast.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_Fast.html"
index d9a0380..44b8214 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_Fast.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_Fast.html"
@@ -287,8 +287,8 @@
, where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150 }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -318,7 +318,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1206' },
success: function (d) {
@@ -560,8 +560,8 @@
, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150 }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -608,7 +608,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+ layer.msg(data.Message, { icon: 1 });
}
else {
layer.msg(data.Message, { icon: 5 });
@@ -848,9 +848,11 @@
elem: '#wl-table'
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
+ , totalRow: true
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -921,10 +923,12 @@
// , url: 'http://61.130.49.162:9090/WMSAPI///OtherOutBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true}
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index 75de0b1..5fbb017 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -467,7 +467,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1211' },
success: function (d) {
@@ -862,12 +862,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -950,11 +951,12 @@
// , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
, url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
index 8540a2c..45fe1f9 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
@@ -380,7 +380,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1247' },
success: function (d) {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 3fac444..75b6c35 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -443,6 +443,8 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HBillType").val(d.data[0].HSourceBillType);
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ $("#HDeptID").val(result.data[0].HDeptID);
+ $("#HDeptName").val(result.data[0].HDeptName);
$("#HSourceBillNo").attr("disabled", "true");
HSourceFlag = true;
//$("#HWHID").val(d.data[0].HWhID);
@@ -538,7 +540,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1205' },
success: function (d) {
@@ -897,7 +899,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm(data.Message + $("#HBillNo").val(), {
+ layer.confirm(data.Message , {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
btn2: function () {
//parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
index 53e1394..3ddfe81 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
@@ -502,7 +502,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1244' },
success: function (d) {
@@ -1078,13 +1078,14 @@
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
, limit: 50
+ , totalRow: true
, limits: [50, 500, 5000, 20000]
, page: true
, cols: [[
{ type: 'radio' }
, { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 7016906..9e76c91 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -503,7 +503,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1204' },
success: function (d) {
@@ -1140,14 +1140,15 @@
elem: '#wl-table'
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
+ , totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
, page: true
, cols: [[
{ type: 'radio' }
, { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
index c441a71..c6ceba3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
@@ -323,7 +323,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1245' },
success: function (d) {
@@ -704,12 +704,13 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1245', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -757,14 +758,15 @@
element.tabChange('tab-ProductlnBackBill', '2');
table.render({
elem: '#wl-table'
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/ProductInBackBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '1245', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 8cc3818..dd6aa5e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -517,7 +517,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1202' },
success: function (d) {
@@ -1358,11 +1358,12 @@
var listOption = {
elem: '#wl-table'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -1439,12 +1440,13 @@
//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index fda988d..7d4481a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -337,7 +337,7 @@
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1203' },
success: function (d) {
@@ -757,45 +757,36 @@
var sMain = sMainStr;
var sSubStr = table.cache['wl-table'];
var sSourceType = $("#HBillType").val();
- if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
- {
- layer.load(3);
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
- //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
- //
- //Sub_ClearBill();
- //
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
+ //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message , { icon: 1 });
+ //
+ //Sub_ClearBill();
+ //
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
- });
- }
- else {
- layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ });
});
@@ -1057,9 +1048,12 @@
elem: '#wl-table'
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
+ ,limit:3000
+ , totalRow: true
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index e6a9def..2c59f83 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -123,19 +123,69 @@
, element = layui.element;
//娓呯┖鐣岄潰 new
- var sBillType = '1203'
+ var sBillType = '1203';
+ var col = [];
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
//鍔犺浇婧愬崟绫诲瀷
+ set_ClearBill();
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Display();
+ //宸蹭笂浼犲垪琛�
+ table.render({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , page: true // 寮�鍚垎椤�
+ , limits: [20, 40, 80, 100]
+ , limit: 20
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ //宸蹭笂浼犳煡璇�
+ table.render({
+ elem: '#sy-table'
+ , toolbar: '#toolbarDemo'
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+ ]]
+ , height: 500
+ })
+ }
- //璇诲彇鍗曟嵁鍒楄〃
- //
-
+ //閫�鍑�
form.on('submit(Cancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
-
+ //缂栬緫
form.on('submit(cmdModify)', function () {
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
@@ -156,30 +206,10 @@
})
});
-
- form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ //鍒锋柊
+ form.on('submit(cmdRefresh)', function () {
+ get_Display();
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: '#yd-table'
, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
, toolbar: '#toolbarDemo'
@@ -206,8 +236,7 @@
}
})
});
-
-
+
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table')
@@ -267,26 +296,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //layer.msg(data.Message, { icon: 1 });
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , where: { HBillType: '1203', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- })
+ get_Display();
}
else {
layer.msg(data.Message, { icon: 2 });
@@ -333,77 +343,61 @@
});
-
- 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");
- }
- })
+ //鍔犺浇缂撳瓨鍒楄〃鏁版嵁
+ function get_Display() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
+ type: "GET",
+ data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ 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')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
- //宸蹭笂浼犲垪琛�
- table.render({
- elem: '#yd-table'
- , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , page: true // 寮�鍚垎椤�
- , limits: [20, 40, 80, 100]
- , limit: 20
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HOrgID', title: '缁勭粐', width: 120 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- })
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render({
+ elem: '#dj-table'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ });
- //宸蹭笂浼犳煡璇�
- table.render({
- elem: '#sy-table'
- , toolbar: '#toolbarDemo'
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HOrgID', title: '缁勭粐', width: 120 }
- ]]
- , height: 500
- })
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鍒锋柊鏄庣粏椤电
table.render({
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_RedOtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_RedOtherInBill_Fast.html"
index 57cd04e..6697d8e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_RedOtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_RedOtherInBill_Fast.html"
@@ -256,7 +256,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1203' },
success: function (d) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
index 56244d4..4072cbf 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
@@ -413,7 +413,7 @@
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1239' },
success: function (d) {
@@ -860,12 +860,13 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/POStockInBackBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1239', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -923,14 +924,15 @@
element.tabChange('tab-POStockInBackBill', '2');
table.render({
elem: '#wl-table'
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBackBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBackBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '1239', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 181e252..e007cf4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -514,7 +514,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
//url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
type: "GET",
data: { "HBillType": '1201' },
@@ -971,7 +971,7 @@
url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
type: "GET",
async: false,
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
playSound1();
@@ -1027,8 +1027,8 @@
$("#HSupID").val(result.data.hSupIDField);
//$("#HDeptName").val(result.data.HDept);
//$("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
+ //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //$("#HBillType").val(result.data.hSourceBillTypeField)
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1102") {
@@ -1104,12 +1104,13 @@
var listOption = {
elem: '#wl-table'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
, { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -1159,14 +1160,15 @@
table.render({
elem: '#wl-table'
, cellMinWidth: 80
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 1d84e34..6619c7d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -384,7 +384,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1210' },
success: function (d) {
@@ -858,12 +858,13 @@
elem: '#wl-table'
, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -932,11 +933,12 @@
//, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
--
Gitblit v1.9.1