From 0a89b74461bea603e557c2dd4956fd23f99d54f4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 18 八月 2025 10:44:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html | 4
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 24 ++
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html | 5
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Mould_PDA.html | 4
WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBill_PDA.html | 4
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html | 4
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html | 4
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBill_PDA.html | 4
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html | 4
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBackBill_PDA.html | 4
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Mould_PDA.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 95 ++++++++
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html | 5
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html | 2
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 4
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 1
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html | 4
WebTM/views/Baseset/基础资料/Gy_DepartmentList_PDA.html | 151 +++++++++++++
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_PDA.html | 4
WebTM/views/home/console_Mobile.html | 6
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html | 4
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html | 5
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 32 ++
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_Mould_PDA.html | 4
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html | 4
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_CusBar_PDA.html | 4
WebTM/WebTM.csproj.user | 2
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBill_PDA.html | 4
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 90 ++++++++
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html | 5
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_Mould_PDA.html | 4
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_CusBar_PDA.html | 4
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBill_PDA.html | 4
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_CusBar_PDA.html | 4
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_WorkShopByCLD_PDA.html | 4
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Mould_PDA.html | 4
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_PDA.html | 4
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html | 5
WebTM/layuiadmin/Scripts/webConfig.js | 9
WebTM/views/WMS扫码模块/小车锁定/Kf_TrolleyPositionBill_PDA.html | 63 +++-
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html | 4
WebTM/WebTM.csproj | 1
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html | 4
44 files changed, 498 insertions(+), 109 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 37ebe0e..2155c32 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,6 +184,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList_PDA.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3c987b4..e3d209c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 327c2d2..00f1da3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,15 +3,14 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- // var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList_PDA.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList_PDA.html"
new file mode 100644
index 0000000..8c4ffd4
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList_PDA.html"
@@ -0,0 +1,151 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>閮ㄩ棬鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">杩囨护鍒�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 0px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ <!--瀛愯〃1-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+ var params = get_UrlVars();
+ var HStockOrgID = params[params[0]];
+ var Type = params[params[1]];
+ if (Type == undefined || Type == '') {
+ Type = "HDept1";
+ }
+
+ //蹇�熸煡璇�
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ //杩斿洖
+ form.on('submit(FH)', function () {
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ switch (Type) {
+ case "HDept1":
+ parent.GetHDeptNameValue(data);
+ break;
+ case "HDept2":
+ parent.GetHDeptName2Value(data);
+ break;
+ }
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '閮ㄩ棬ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '閮ㄩ棬浠ｇ爜' }
+ , { field: 'HName', width: 150, title: '閮ㄩ棬鍚嶇О', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ switch (Type) {
+ case "HDept1":
+ parent.GetHDeptNameValue(data);
+ break;
+ case "HDept2":
+ parent.GetHDeptName2Value(data);
+ break;
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/WEBSController/GetDepartmentList_Json",
+ async: true,
+ data: { "Department": Value, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 8ae6bcc..fc1fce2 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -1105,7 +1105,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1759,7 +1759,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
index ef9acef..df349d9 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
@@ -58,6 +58,7 @@
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -82,9 +83,7 @@
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs2" style="margin-left:5px">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
- </div>
+
</div>
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
index be7f8f3..2057dc3 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
@@ -1229,7 +1229,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1920,7 +1920,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
index 74b609f..735d37d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
@@ -1045,7 +1045,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1711,7 +1711,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
index fae4934..0d95624 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
@@ -1156,7 +1156,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1807,7 +1807,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
index 87899af..533cc71 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
@@ -667,7 +667,7 @@
}
});
- $("#HEquipBarCode").val("");
+ //$("#HEquipBarCode").val("");
}
});
@@ -916,7 +916,7 @@
});
if (sBarCode != "") {
- $('#HCarBarCode').val("");
+ //$('#HCarBarCode').val("");
}
//璋冭浆鍒扮浜屼釜椤电
element.tabChange('tab-Kf_TrolleyPositionBill_PDA', '2');
@@ -998,8 +998,46 @@
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
-
//#endregion
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if (table.cache['wl-table'].length >= 1) {
+ var sSubStr = JSON.stringify(table.cache['wl-table']);
+
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HCarBarCode == "" || sSubStr[i].HCarBarCode == undefined || sSubStr[i].HCarBarCode == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,灏忚溅缂栧彿涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ((sSubStr[i].HSPID == 0 || sSubStr[i].HSPID == undefined || sSubStr[i].HSPID == null) && (sSubStr[i].HEquipID == 0 || sSubStr[i].HEquipID == undefined || sSubStr[i].HEquipID == null)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,闇�鎵爜缁戝畾浠撲綅鎴栨満鍙帮紝涓嶅厑璁镐粨浣嶅拰鏈哄彴淇℃伅閮戒负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ } else {
+ layer.msg("鏄庣粏璁板綍涓虹┖锛屼笉鍏佽鎻愪氦!璇锋壂灏忚溅鏉＄爜", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ return true;
+ }
});
@@ -1034,24 +1072,7 @@
HSPObj = obj;
}
- }
-
- //鍗曟嵁涓婁紶鍓嶅垽鏂�
- function AllowLoadData(sSubStr) {
- if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- return true;
- }
+ }
</script>
</body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
index 45c8a75..92ed167 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
@@ -428,9 +428,9 @@
break;
default:
- if (data[i].name == '浠撳簱') {
+ if (data[i].name == '浠撳簱' || data[i].name == '鎵瑰彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
- } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐') {
+ } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐' || data[i].name == '浠撲綅浠ｇ爜' ) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center' });
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
index 8bb9d56..47457db 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
@@ -58,6 +58,7 @@
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -82,9 +83,9 @@
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs2" style="margin-left:5px">
+ <!--<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
- </div>
+ </div>-->
</div>
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
index 1e3e981..b1e4021 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
@@ -1078,7 +1078,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1709,7 +1709,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
index 6986ec1..42ef530 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
@@ -844,7 +844,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1407,8 +1407,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
index c39edd8..963b9f1 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
@@ -58,6 +58,7 @@
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -82,9 +83,7 @@
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs2" style="margin-left:5px">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
- </div>
+
</div>
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
index 0534ff2..d588cc4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
@@ -1140,7 +1140,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1744,7 +1744,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
index 260b80d..3ce2763 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
@@ -58,6 +58,7 @@
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -82,9 +83,7 @@
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs2" style="margin-left:5px">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
- </div>
+
</div>
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
index 4cd7fc7..9e6e73e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
@@ -1742,7 +1742,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2874,7 +2874,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
index 43f177d..89c051b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
@@ -1734,7 +1734,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2581,7 +2581,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
index e85124e..3864cc7 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
@@ -1692,7 +1692,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2525,7 +2525,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
index 719596c..f918d71 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -1486,7 +1486,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2503,7 +2503,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
index 19c7576..b3b484a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
@@ -1221,7 +1221,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1891,8 +1891,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
index bd1164a..daec2cc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
@@ -1173,7 +1173,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1794,8 +1794,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
index 51ee691..91c6acc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
@@ -1368,7 +1368,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2389,7 +2389,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
index 3e4bf31..6e2827a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
@@ -1360,7 +1360,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2139,7 +2139,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
index 639bfd3..9d55ef9 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
@@ -1312,7 +1312,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2042,7 +2042,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
index 0f7b91a..c60249e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
@@ -970,7 +970,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1486,8 +1486,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
index e0fd54a..0cab927 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
@@ -58,6 +58,7 @@
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -82,9 +83,7 @@
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs2" style="margin-left:5px">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
- </div>
+
</div>
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index a6182b4..e2da968 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -1168,7 +1168,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1806,7 +1806,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
index 65655c7..5371a6e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
@@ -1021,7 +1021,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1668,8 +1668,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
index 4f7e923..5b818ea 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
@@ -1093,7 +1093,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1808,7 +1808,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
index d3cd0d0..f6bc6c2 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
@@ -1045,7 +1045,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1711,7 +1711,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_PDA.html"
index 0fc546e..845bc79 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_PDA.html"
@@ -1003,7 +1003,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1611,8 +1611,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
index 8479e9b..a168913 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
@@ -1224,7 +1224,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2147,7 +2147,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
index 7c94dc9..96de69c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
@@ -1216,7 +1216,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1927,7 +1927,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
index 96b4f8c..2523692 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
@@ -1168,7 +1168,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1830,7 +1830,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 7015324..787b2af 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -225,12 +225,6 @@
<cite style="white-space:pre-wrap">鏍峰搧閿�鍞嚭搴撳崟</cite>
</a>
</li>
- <li class="layui-col-xs3">
- <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA.html" target="main_self_frame">
- <i class="layui-icon layui-icon-template-1"></i>
- <cite style="white-space:pre-wrap">璋冩嫧</cite>
- </a>
- </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index fa66c84..1f287b8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -615,7 +615,7 @@
$("#ColName1").val("0");
$("#Comparator1").val("0");
form.render('select');
- sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+ //sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
$("#btnSearch").click();
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 9903a8b..a3177bc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -1620,6 +1620,7 @@
, "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
, 'HICMOTempID': "0"
, 'HRemark': ""
+ , 'HPRODUCEDATE': dataArray[i].鐢熶骇鏃ユ湡
}
);
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fa351a5..4c1a350 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -223,6 +223,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>鎾ゅ洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�(璁剧疆鏃堕棿)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
@@ -377,6 +378,9 @@
break;
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //鍙嶅叧闂缃椂闂�
+ case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
break;
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn-Drop':set_DropBill(1);
@@ -1601,6 +1605,97 @@
}
}
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBillSetDate(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var HInterID = data[0].hmainid;
+ if (data.length == 1) {
+ // 寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ title: '璁剧疆鏃堕棿鑼冨洿',
+ area: ['500px', '300px'],
+ content: `
+ <div class="layui-form" style="padding: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="startTime" placeholder="璇烽�夋嫨寮�濮嬫椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="endTime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-input-block" style="margin-left: 0; text-align: center;">
+ <button class="layui-btn" id="confirmTime">纭畾</button>
+ <button class="layui-btn layui-btn-primary" id="cancelTime">鍙栨秷</button>
+ </div>
+ </div>
+ </div> `,
+ success: function (layero, index) {
+ $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
+ // 纭畾鎸夐挳鐐瑰嚮浜嬩欢
+ $('#confirmTime').on('click', function () {
+ var startTime = $('#startTime').val();
+ var endTime = $('#endTime').val();
+
+ if (!startTime) {
+ layer.msg('璇烽�夋嫨寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+
+ if (!endTime) {
+ layer.msg('璇烽�夋嫨缁撴潫鏃堕棿', { icon: 2 });
+ return;
+ }
+
+ if (new Date(endTime) < new Date(startTime)) {
+ layer.msg('缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
+ success: function (result) {
+ if (result.count == 1) {
+ // 杩欓噷鍙互澶勭悊鑾峰彇鍒扮殑鏃堕棿鑼冨洿
+ layer.msg('鏃堕棿鑼冨洿宸茶缃細' + startTime + ' 鑷� ' + endTime, { icon: 1 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ });
+
+ });
+
+ // 鍙栨秷鎸夐挳鐐瑰嚮浜嬩欢
+ $('#cancelTime').on('click', function () {
+ layer.close(index);
+ });
+ },
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//#region 鍙嶄綔搴�/浣滃簾鏁版嵁 [1 浣滃簾銆�2 鍙嶄綔搴焆
function set_DropBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
index aa43c8e..8b9a21e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
@@ -643,7 +643,7 @@
function get_DisplayPage(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationEntrustOutBill/getStationEntrustOutBillPage',
+ url: GetWEBURL() + '/Cj_StationEntrustInBill/getStationEntrustInBillPage',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index e0ec82d..af4eec0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1215,6 +1215,96 @@
get_HWorkShift(HDeptID);
}
break;
+ default:
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HProcPlanEntryID": data.hsubid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "HPRDOrgID": data.缁勭粐
+ });
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ HDeptID = data.HWorkShopID;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ async: false,
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ });
+
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+ , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , height: 500
+ }
+ table.render(option)
+
+ getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
+ if (OperationType != 4) {
+ //鑾峰彇鐝
+ get_HWorkShift(HDeptID);
+ }
+ break;
}
//layer.close(index);
//set_InitGrid();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 2ffd82e..56077f8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -2225,7 +2225,7 @@
sWhere += " and HBillSubType<>''SUB''";
sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
-
+ sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -2774,6 +2774,34 @@
}
//#endregion
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+ function getDeptIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"]},
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HItemID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and HDeptID in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
@@ -2843,7 +2871,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
index 08c9d2e..6e7aa32 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
@@ -279,6 +279,30 @@
break;
};
});
+
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
+ table.on('sort(mainTable2)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable2', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option2.data = layui.table.cache["mainTable2"];
+ table.render(option);
+ });
//#endregion
//#region 閲嶇疆鎸夐挳
--
Gitblit v1.9.1