From 647b1e325e452b98f34c8853eb286c61852b79fc Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 06 七月 2022 14:57:08 +0800
Subject: [PATCH] n
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 26 +++++++++----
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 6 +-
WebTM/WebTM.csproj.user | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 2 +
WebTM/views/index_Mobile.html | 12 +++---
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 4 +
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
WebTM/views/index.html | 59 +++++++++++++++++------------
8 files changed, 69 insertions(+), 46 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/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 29cd12c..66a22f1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,13 +1,13 @@
锘�
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
+ var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
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/\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..807d704 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"
@@ -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 }
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..867d1eb 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 fda988d..5cbc4b2 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"
@@ -770,12 +770,20 @@
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;
+ //layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+ ////
+ ////Sub_ClearBill();
+ ////
+ ////鐏板害鎻愪氦鎸夐挳Saver
+ //document.getElementById("Saver").disabled = false;
+ layer.confirm("鐢熸垚鍏朵粬鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
+ }, function () { window.location.reload(); });//鏂板
}
else {
layer.msg(data.Message, { icon: 5 });
@@ -1057,9 +1065,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 }
@@ -1068,7 +1078,7 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
, { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }+
]]
, height: 500
, done: function () {
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..531e386 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