From b7238e3d561370ae89119e7c7ded17f3ed64ff21 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 07 七月 2022 15:47:45 +0800
Subject: [PATCH] 1
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 5 +
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 6 +-
WebTM/WebTM.csproj.user | 2
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 54 ++++++++++-------
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 2
WebTM/views/index_Mobile.html | 12 ++--
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 15 +++--
WebTM/views/index.html | 59 +++++++++++--------
9 files changed, 92 insertions(+), 64 deletions(-)
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..3672d95 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -106,7 +106,7 @@
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -150,9 +150,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 閿�鍞鐞� -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -188,7 +188,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>
@@ -211,7 +211,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曠淮鎶�</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd>
- <dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>
+ <!--<dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>-->
<dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
<dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
@@ -231,8 +231,17 @@
<dd>
<a>鏉＄爜涓绘。</a>
<dl class="layui-nav-child">
- <dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">鏉＄爜鐢熸垚</a></dd>
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">鏉＄爜鐢熸垚</a></dd>-->
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉＄爜涓绘。缁存姢</a></dd>
+ </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>
@@ -247,7 +256,7 @@
</dl>
</li>
<!-- 璁″垝绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -290,9 +299,9 @@
<dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
</dl>
- </li>
+ </li>-->
<!-- 鐢熶骇绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -372,9 +381,9 @@
<dd>
<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_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>
+ <!--</dl>
</dd>
<dd>
<a>瑕佹枡璁″垝</a>
@@ -415,9 +424,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 杞﹂棿绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -488,9 +497,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 璐ㄩ噺绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -546,9 +555,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 鍣ㄥ叿绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -639,9 +648,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 璁惧绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -689,9 +698,9 @@
</dl>
</dd>
</dl>
- </li>
+ </li>-->
<!-- 宸ヨ祫绠＄悊 -->
- <li data-name="set" class="layui-nav-item">
+ <!--<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">
<dd>
@@ -762,9 +771,9 @@
</dl>
</dd>
</dl>
- </li>
+ </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/\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/\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 730e327..6889839 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 }
@@ -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 }
@@ -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 }
@@ -924,7 +926,8 @@
, where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150 }
+ , { 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/\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 0562655..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);
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 edf8ef6..91c5b3c 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"
@@ -1048,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\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 6514610..46e5f7f 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"
@@ -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") {
--
Gitblit v1.9.1