From a011663fa92dcf8b63ff0fbf793be7883ce38acc Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 22:57:42 +0800
Subject: [PATCH] 龙山汽配打印界面，F7物料列表,便捷方式；条码打印修复列设置，表体添加炉号、钢卷号等字段；职员，仓库打印条码；条码档案列表添加炉号等字段；工序出站PDA；流转卡派工单；
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 26
WebTM/views/grf/eee.grf | 323 ++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_EmployeeList.aspx | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_WarehouseList.aspx | 26
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html | 46
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 9
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 30
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 18
WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html | 278 +++++
WebTM/views/grf/工序派工单.grf | 356 +++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 17
WebTM/views/home/console.html | 10
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcExchSendWorkBillList.aspx | 27
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs | 26
WebTM/views/home/console_Mobile.html | 102 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 4
WebTM/views/Baseset/基础资料/Gy_MaterialList_LSQP.html | 133 ++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 9
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 30
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_WarehouseList.aspx.cs | 17
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 38
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 14
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 8
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs | 17
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 10
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 151 ++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint_GXPG.html | 211 ++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_WarehouseList.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_EmployeeList.aspx.cs | 17
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 89 -
WebTM/views/grf/流转卡派工单.grf | 680 ++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_EmployeeList.aspx.designer.cs | 26
WebTM/WebTM.csproj | 30
33 files changed, 2,641 insertions(+), 189 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 940ad38..e384a38 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -110,6 +110,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\SRM_OpenTmpList _GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
@@ -117,6 +118,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldFileMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
@@ -186,7 +188,11 @@
<Content Include="views\video\success.wav" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_Detail.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillList.html" />
@@ -319,6 +325,9 @@
<Content Include="views\grf\cabinet-SB.grf" />
<Content Include="views\grf\ces5.grf" />
<Content Include="views\grf\璁惧鏍囩.grf" />
+ <Content Include="views\grf\娴佽浆鍗℃淳宸ュ崟.grf" />
+ <Content Include="views\grf\eee.grf" />
+ <Content Include="views\grf\宸ュ簭娲惧伐鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1357,6 +1366,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
<DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1377,6 +1393,13 @@
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx.cs">
<DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
@@ -1595,6 +1618,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html b/WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html
new file mode 100644
index 0000000..8e75751
--- /dev/null
+++ b/WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html
@@ -0,0 +1,278 @@
+锘�<!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-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-brief" lay-filter="tabDemo">
+ <ul class="layui-tab-title">
+ <li class="layui-this" lay-id="1">鎵撳嵃妯℃澘鍒楄〃</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+
+ <table class="layui-hide" id="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </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>
+ layui.use(['table', 'form', 'layer', 'element'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer
+ , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: 'ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '妯″潡浠ｇ爜', hide: true }
+ , { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
+ , { field: '妯℃澘鍚嶇О', title: '妯℃澘鍚嶇О' }
+ ]]
+ });
+
+
+ table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
+ obj.tr.find('input[lay-type="layTableRadio"]').prop("checked", true);
+ form.render('radio');
+ });
+
+
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]];
+ var MyMsg = params[params[1]];
+ var Type = params[params[2]];
+ var entryid = params[params[3]];
+
+ //var lentryid = params[params[1]];
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadList(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+ async: true,
+ data: { "HNumber": Value },
+ //data: { "Value": Value },
+ 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);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ RoadList(Type);
+
+ form.on('submit(Add)', function (data) {//鏂板
+ element.tabDelete('tabDemo', '2'); //鍒犻櫎
+ element.tabAdd('tabDemo', {
+ title: '鏂板妯℃澘'
+ , content: '<div class="layui-form-item">' +
+ '<div class="layui-row">' +
+ '<div class="layui-col">' +
+ '<label class="layui-form-label"> 妯″潡鍚嶏細</label>' +
+ '<div class="layui-input-inline">' +
+ '<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" readonly="readonly" autocomplete="off">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-row">' +
+ '<div class="layui-col">' +
+ '<label class="layui-form-label"> 妯℃澘鍚嶇О锛�</label>' +
+ '<div class="layui-input-inline">' +
+ '<input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">' +
+ '</div>' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<div class="layui-row">' +
+ '<div class="layui-col">' +
+ '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Save">淇濆瓨</button>' +
+ '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Cancel">鍙栨秷</button>' +
+ '</div>' +
+ '</div>' +
+ '</div>' +
+ '</div>' +
+ '</div>' //鏀寔浼犲叆(html浠ｇ爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
+ , id: '2' //閫夐」鍗℃爣棰樼殑lay-id灞炴�у��
+ });
+ $("#HNumber").val(Type);
+ element.tabChange('tabDemo', '2');
+ });
+
+ form.on('submit(Del)', function (data) {//鍒犻櫎
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var OpenTmp = data[0].HItemID;
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Open_PrintTem/DelOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HItemID": OpenTmp },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ RoadList(Type);
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+ });
+ form.on('submit(Reload)', function (data) {//鍒锋柊
+ RoadList(Type);
+ });
+ form.on('submit(Save)', function (obj) {//淇濆瓨
+ var Tmp = obj.field;
+ if (Tmp.HName == '') {
+ layer.msg("妯℃澘鍚嶇О涓嶈兘涓虹┖~", {
+ icon: 5,
+ shade: [0.8, '#2F4F4F'] // 閫忔槑搴� 棰滆壊
+ });
+ return false;
+ }
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Open_PrintTem/SaveOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ RoadList(Type);
+ element.tabChange('tabDemo', '1');
+ element.tabDelete('tabDemo', '2'); //鍒犻櫎
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+ });
+ form.on('submit(Cancel)', function (data) {//鍙栨秷
+ element.tabChange('tabDemo', '1');
+ element.tabDelete('tabDemo', '2'); //鍒犻櫎
+ });
+ form.on('submit(Select)', function (data) {//閫夋嫨
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var OpenTmp = data[0].妯℃澘鍚嶇О;
+ console.log(linterid.toString());
+ //鎵撳紑鎵撳嵃妯℃澘
+ window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString() + "&entryid=" + entryid);
+ //鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴
+ var url = "";
+ switch (Type) {
+ case "HGy_BarCodeBill": //HBarCodePrint
+ url = "/Sc_BarCode/UpdateBarcodePrintQty"
+ break;
+ case "HPOInStockBill":
+ url = "UpdatePOInStockBillPrintQty"
+ break;
+ }
+ //鏇存柊鎵撳嵃鏁伴噺
+ //$.ajax(
+ // {
+ // type: "POST",
+ // url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // async: true,
+ // data: { "msg": MyMsg },
+ // dataType: "json",
+ // contentType: 'application/json',
+ // success: function (data) {
+ // layer.closeAll("loading");
+ // },
+ // error: function (err) {
+ // parent.f_alert("閿欒:" + err);
+ // }
+ // });
+
+ //鍏抽棴褰撳墠绐楀彛
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ form.on('submit(Exit)', function (data) {//閫�鍑�
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+
+
+
+
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html"
new file mode 100644
index 0000000..3960706
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html"
@@ -0,0 +1,133 @@
+锘�<!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-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HModel" id="HModel" lay-verify="HModel" autocomplete="off" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" class="layui-input">
+ </div>
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReset">閲嶇疆</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <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>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨鐗╂枡
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#HModel').val());
+ });
+ form.on('submit(HReset)', function () {//閲嶇疆杩囨护鏉′欢
+ RoadReset();
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鐗╂枡
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHMaterNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#HModel').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', sort: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', hide: true }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', hide: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', hide: true }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"];
+
+ if ($("#HModel").val() != null) {
+ Value += " and HModel like '%" + $("#HModel").val() + "%'"
+ }
+ if ($("#HName").val() != null) {
+ Value += " and HName like '%" + $("#HName").val() + "%'"
+ }
+ //if (Value == null) {
+ // Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"];
+ //} else {
+ // Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " and ( HNumber like '%" + Where + "%' or HName like '%" + Where + "%' or HModel like '%" + Where + "%') "
+ //}
+ var index = layer.load();
+ $.ajax({
+ type: "get",
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+ url: GetWEBURL() + "/Web/GetMaterialList_Json",
+ async: true,
+ data: { "sWhere": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ layer.close(index);
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+
+ function RoadReset() {
+ $("#HModel").val("");
+ $("#HName").val("");
+ }
+
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/grf/eee.grf b/WebTM/views/grf/eee.grf
new file mode 100644
index 0000000..e256edf
--- /dev/null
+++ b/WebTM/views/grf/eee.grf
@@ -0,0 +1,323 @@
+锘縊bject Report
+ Version='6.8.5.5'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=11
+ Oriention=Landscape
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=3.99521
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=7.80521
+ Top=0.211667
+ Width=8.99583
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=217500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐢熶骇宸ュ崟'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.079375
+ Top=1.40229
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鍙�:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=0.079375
+ Top=2.2225
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎴愬搧缂栧彿:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=18.5208
+ Top=2.14313
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏉愯川鏂欏帤:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox5'
+ Left=9.71021
+ Top=1.40229
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧缂栫爜:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=18.5208
+ Top=1.34938
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='灏忕増鏈�:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=11.721
+ Top=1.40229
+ Width=6.77333
+ Height=0.608542
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=9.68375
+ Top=2.11667
+ Width=2.11667
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.87375
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鏁伴噺:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox9'
+ Left=5.87375
+ Top=2.11667
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁㈠崟鏁伴噺:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=11.8004
+ Top=2.11667
+ Width=6.69396
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=7.67292
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox10'
+ Left=0.132292
+ Top=3.20146
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='涓嬪崟鏃ユ湡:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox11'
+ Left=5.79438
+ Top=3.04271
+ Width=2.59292
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁″垝瀹屽伐鏃ユ湡:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=1.93146
+ Top=3.20146
+ Width=2.32833
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=8.38729
+ Top=3.04271
+ Width=2.38125
+ Height=0.79375
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=1.48167
+ Top=1.40229
+ Width=2.80458
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=1.48167
+ Top=1.40229
+ Width=2.59292
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=20.32
+ Top=1.34938
+ Width=3.20146
+ Height=0.582083
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox15'
+ Left=18.6002
+ Top=2.98979
+ Width=5.21229
+ Height=0.820208
+ WordWrap=T
+ TextAlign=MiddleCenter
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=23.8125
+ Top=1.00542
+ Width=2.59292
+ Height=2.80458
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox13'
+ Left=7.88458
+ Top=2.11667
+ Width=1.5875
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox16'
+ Left=1.87854
+ Top=2.2225
+ Width=3.91583
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox14'
+ Left=10.8744
+ Top=3.20146
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ簭娴佽浆鍗″彿:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox17'
+ Left=13.679
+ Top=3.20146
+ Width=2.98979
+ Height=0.608542
+ End
+ End
+ RepeatOnPage=T
+ End
+End
+End
diff --git "a/WebTM/views/grf/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225.grf" "b/WebTM/views/grf/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225.grf"
new file mode 100644
index 0000000..78bc05f
--- /dev/null
+++ "b/WebTM/views/grf/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225.grf"
@@ -0,0 +1,356 @@
+锘縊bject Report
+ Version='6.8.5.5'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=10
+ Height=5
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏂欏彿'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ Type=Integer
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='鏈哄彴缂栧彿'
+ End
+ Item
+ Name='鐢熶骇鎵瑰彿'
+ End
+ Item
+ Name='鍒剁▼'
+ End
+ Item
+ Name='鍑�閲�'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='姣涢噸'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy-MM'
+ End
+ Item
+ Name='璐熻矗浜�'
+ End
+ Item
+ Name='瀹㈡埛鍨嬪彿'
+ End
+ Item
+ Name='鍘嬫満鍨嬪彿'
+ End
+ Item
+ Name='鐗╂枡缂栫爜'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='Field1'
+ End
+ Item
+ Name='鐢熶骇鏃ユ湡'
+ Type=DateTime
+ Format='yy/MM/dd'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='鐢熸垚鏃ユ湡'
+ Type=DateTime
+ Format='yy/MM/dd'
+ End
+ Item
+ Name='杞﹂棿'
+ End
+ Item
+ Name='鐢熶骇璧勬簮浠ｇ爜'
+ End
+ Item
+ Name='鐢熶骇璧勬簮'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ Lock=None
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ Lock=None
+ End
+ Item
+ Name='娲惧伐鏁伴噺'
+ End
+ Item
+ Name='鍗曟嵁鍙�'
+ Lock=None
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=10.0013
+ End
+ End
+Object ColumnContent
+ Height=5.00063
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=1.79917
+ Top=0.396875
+ Width=3.20146
+ Height=1.13771
+ Object Font
+ Name='榛戜綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ Text='宸ュ簭娲惧伐鍗�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode6'
+ Left=5.3975
+ Top=0.211667
+ Width=4.31271
+ Height=1.37583
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.238125
+ Top=1.71979
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=4
+ RowCount=4
+ Items FreeGridColumn
+ Item[1]
+ Width=1.69333
+ End
+ Item[2]
+ Width=2.93688
+ End
+ Item[3]
+ Width=1.93146
+ End
+ Item[4]
+ Width=3.01625
+ End
+ End
+ Items FreeGridRow
+ Item[2]
+ Height=0.7
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜'
+ End
+ Item[1,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ Text='[#浜у搧浠ｇ爜#]'
+ End
+ Item[1,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О'
+ End
+ Item[2,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ Text='[#浜у搧鍚嶇О#]'
+ ColSpan=3
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿'
+ End
+ Item[3,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#瑙勬牸鍨嬪彿#]'
+ End
+ Item[3,3]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏁伴噺'
+ End
+ Item[3,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#娲惧伐鏁伴噺#]'
+ End
+ Item[4,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='娲惧伐鍗曞彿'
+ End
+ Item[4,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='[#鏉＄爜缂栧彿#]'
+ ColSpan=3
+ End
+ End
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=3.81
+ Top=0.343958
+ Width=1.40229
+ Height=1.19063
+ Object Font
+ Name='榛戜綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ End
+End
+End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241\346\264\276\345\267\245\345\215\225.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241\346\264\276\345\267\245\345\215\225.grf"
new file mode 100644
index 0000000..9a559b2
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241\346\264\276\345\267\245\345\215\225.grf"
@@ -0,0 +1,680 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ Oriention=Landscape
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='宸ュ崟鏁伴噺'
+ End
+ Item
+ Name='璁㈠崟鏁伴噺'
+ End
+ Item
+ Name='涓嬪崟鏃ユ湡'
+ End
+ Item
+ Name='璁″垝瀹屽伐鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ DBFieldName='宸ヨ壓鍚嶇О'
+ End
+ Item
+ Name='鍔犲伐璇存槑'
+ End
+ Item
+ Name='娴佽浆鍗＄紪鍙�'
+ End
+ Item
+ Name='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='璁″垝寮�宸ユ棩鏈�'
+ Type=DateTime
+ Format='yyyy//MM//dd'
+ End
+ Item
+ Name='鍘熸枡鎵规'
+ End
+ Item
+ Name='妯″叿璁惧'
+ End
+ Item
+ Name='娴佹按鍙�'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='浜у搧瑙勬牸'
+ End
+ Item
+ Name='璁㈠崟璺熻釜鍙�'
+ End
+ Item
+ Name='椤圭洰鍙�'
+ End
+ Item
+ Name='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='鍥惧彿鐗堟湰'
+ End
+ Item
+ Name='鎴愬搧缂栧彿'
+ End
+ Item
+ Name='鏉愯川'
+ End
+ Item
+ Name='宸ヨ壓鍙傛暟'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='妯″叿缂栧彿'
+ End
+ Item
+ Name='鐗堟湰'
+ End
+ Item
+ Name='鎬昏鍥惧彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column11'
+ Width=0.978958
+ End
+ Item
+ Name='Column1'
+ Width=1.5875
+ End
+ Item
+ Name='Column2'
+ Width=1.79917
+ End
+ Item
+ Name='Column3'
+ Width=1.79917
+ End
+ Item
+ Name='Column4'
+ Width=1.79917
+ End
+ Item
+ Name='Column5'
+ Width=1.79917
+ End
+ Item
+ Name='Column6'
+ Width=1.40229
+ End
+ Item
+ Name='Column7'
+ Width=2.59292
+ End
+ Item
+ Name='Column8'
+ Width=5.02708
+ End
+ Item
+ Name='Column9'
+ Width=6.58813
+ End
+ Item
+ Name='Column10'
+ Width=1.19063
+ End
+ End
+ Object ColumnContent
+ Height=1.79917
+ RowsPerPage=12
+ Items ColumnContentCell
+ Item
+ Column='Column11'
+ DataField='娴佹按鍙�'
+ End
+ Item
+ Column='Column1'
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column2'
+ End
+ Item
+ Column='Column3'
+ End
+ Item
+ Column='Column4'
+ End
+ Item
+ Column='Column5'
+ End
+ Item
+ Column='Column6'
+ End
+ Item
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid3'
+ Top=-0.0264583
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=1
+ Items FreeGridColumn
+ Item[1]
+ Width=1.29646
+ End
+ Item[2]
+ Width=1.27
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.905
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ BorderCustom=T
+ End
+ End
+ End
+ End
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='妯″叿缂栧彿'
+ End
+ Item
+ Column='Column9'
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='宸ヨ壓鍙傛暟'
+ End
+ Item
+ Column='Column10'
+ TextAlign=MiddleCenter
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.5875
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column11'
+ TextAlign=MiddleCenter
+ Text='娴佹按\r\n鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ TextAlign=MiddleCenter
+ Text='宸ヨ壓鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ TextAlign=MiddleCenter
+ Text='瀹屾垚鏃堕棿'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ TextAlign=MiddleCenter
+ Text='鎿嶄綔鑰�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ TextAlign=MiddleCenter
+ Text='棣栨'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ TextAlign=MiddleCenter
+ Text='杞簭妫�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column6'
+ TextAlign=MiddleCenter
+ Text='鑹搧鏁�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column7'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid2'
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ ShadowColor=White
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.27
+ End
+ Item[2]
+ Width=1.32292
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.687917
+ End
+ Item[2]
+ Height=0.926042
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ TextAlign=MiddleCenter
+ Text='涓嶈壇鍝佹暟'
+ ColSpan=2
+ End
+ Item[2,1]
+ TextAlign=MiddleCenter
+ Text='鏉ユ枡\r\n涓嶈壇'
+ End
+ Item[2,2]
+ TextAlign=MiddleCenter
+ Text='宸ュ簭\r\n涓嶈壇'
+ End
+ End
+ End
+ End
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ TextAlign=MiddleCenter
+ Text='妯℃鍏风紪鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ TextAlign=MiddleCenter
+ Text='鍔犲伐鍐呭瑕佹眰'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=3.99521
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=7.80521
+ Top=0.211667
+ Width=8.99583
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=217500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐢熶骇宸ュ崟'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.079375
+ Top=1.40229
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鍙�:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=0.079375
+ Top=2.2225
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎴愬搧缂栧彿:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=18.5208
+ Top=2.14313
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏉愯川鏂欏帤:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox5'
+ Left=9.71021
+ Top=1.40229
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧缂栫爜:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=18.5208
+ Top=1.34938
+ Width=1.79917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='灏忕増鏈�:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=11.721
+ Top=1.40229
+ Width=6.77333
+ Height=0.608542
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=9.68375
+ Top=2.11667
+ Width=2.11667
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.87375
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ崟鏁伴噺:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox9'
+ Left=5.87375
+ Top=2.11667
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁㈠崟鏁伴噺:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=11.8004
+ Top=2.11667
+ Width=6.69396
+ Height=0.608542
+ DataField='浜у搧鍚嶇О'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=7.67292
+ Top=1.42875
+ Width=1.79917
+ Height=0.608542
+ DataField='娴佽浆鍗℃暟閲�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox10'
+ Left=0.132292
+ Top=3.20146
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='涓嬪崟鏃ユ湡:'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox11'
+ Left=5.79438
+ Top=3.04271
+ Width=2.59292
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='璁″垝瀹屽伐鏃ユ湡:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=1.93146
+ Top=3.20146
+ Width=2.32833
+ Height=0.608542
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=8.38729
+ Top=3.04271
+ Width=2.38125
+ Height=0.79375
+ DataField='璁″垝瀹屽伐鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=1.48167
+ Top=1.40229
+ Width=2.80458
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇璁㈠崟鍙�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=1.48167
+ Top=1.40229
+ Width=2.59292
+ Height=0.608542
+ DataField='浠诲姟鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=20.32
+ Top=1.34938
+ Width=3.20146
+ Height=0.582083
+ DataField='鐗堟湰'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox15'
+ Left=18.6002
+ Top=2.98979
+ Width=5.21229
+ Height=0.820208
+ WordWrap=T
+ TextAlign=MiddleCenter
+ DataField='鏉愯川'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=23.8125
+ Top=1.00542
+ Width=2.59292
+ Height=2.80458
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox13'
+ Left=7.88458
+ Top=2.11667
+ Width=1.5875
+ Height=0.608542
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox16'
+ Left=1.87854
+ Top=2.2225
+ Width=3.91583
+ Height=0.582083
+ DataField='鎴愬搧缂栧彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox14'
+ Left=10.8744
+ Top=3.20146
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='宸ュ簭娴佽浆鍗″彿:'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox17'
+ Left=13.679
+ Top=3.20146
+ Width=2.98979
+ Height=0.608542
+ DataField='鍗曟嵁鍙�'
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+End
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 8014938..37cf596 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -68,9 +68,9 @@
</a>
</li>
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">
+ <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
<i class="layui-icon layui-icon-app"></i>
- <cite>涓嬫灦鎵捐揣鍗�</cite>
+ <cite>鏉＄爜鐢熸垚</cite>
</a>
</li>
</ul>
@@ -187,9 +187,9 @@
</a>
</li>
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-location"></i>
- <cite>涓嬫灦鎵捐揣鍗�</cite>
+ <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-app"></i>
+ <cite>鏉＄爜鐢熸垚</cite>
</a>
</li>
</ul>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 80f7d63..f276d32 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -76,53 +76,11 @@
</a>
</li>-->
<li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>鐢熶骇琛ユ枡</cite>
- </a>
- </li>
- <!--<li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-find-fill"></i>
- <cite>鐢熶骇鎷嗙鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
- <i class="layui-icon layui-icon-find-fill"></i>
- <cite>鐢熶骇姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
- <i class="layui-icon layui-icon-find-fill"></i>
- <cite>鏉＄爜搴撳瓨</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-find-fill"></i>
- <cite>缁勬墭鍗曠紪杈�</cite>
- </a>
- </li>-->
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
- <i class="layui-icon layui-icon-align-center"></i>
- <cite>鐢熶骇姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
<a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
<i class="layui-icon layui-icon-android"></i>
<cite>鐢熶骇鍏ュ簱</cite>
</a>
</li>
- <!--<li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
- <i class="layui-icon layui-icon-find-fill"></i>
- <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
- </a>
- </li>-->
<li class="layui-col-xs3">
<a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
<i class="layui-icon layui-icon-app"></i>
@@ -135,12 +93,56 @@
<cite>鐩存帴璋冩嫧</cite>
</a>
</li>
+ <!--<li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐢熶骇鎷嗙鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐢熶骇姹囨姤鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鏉＄爜搴撳瓨</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>缁勬墭鍗曠紪杈�</cite>
+ </a>
+ </li>-->
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
<i class="layui-icon layui-icon-auz"></i>
- <cite>鍒嗗竷璋冨嚭</cite>
+ <cite>鍑虹珯姹囨姤</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-align-center"></i>
+ <cite>閲囪喘鍏ュ簱</cite>
+ </a>
+ </li>
+
+
+ <!--<li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
+ </a>
+ </li>-->
+ <!--<li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-auz"></i>
+ <cite>鍒嗗竷璋冨嚭</cite>
+ </a>
+ </li>-->
<li class="layui-col-xs3">
<a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
<i class="layui-icon layui-icon-bluetooth"></i>
@@ -213,6 +215,18 @@
<cite>閿�鍞嚭搴撴牎楠�</cite>
</a>
</li>
+ <!--<li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鐢熶骇琛ユ枡</cite>
+ </a>
+ </li>-->
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-align-center"></i>
+ <cite>鐢熶骇姹囨姤鍗�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 8a0b5b2..4d1ebb0 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -67,8 +67,8 @@
<select name="HBillType" id="HBillType">
<option value="1402">鍙戣揣閫氱煡鍗�</option>
<option value="1243">璋冩嫧鐢宠鍗�</option>
- <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
- <option value="1604">濮斿鐢ㄦ枡娓呭崟</option>
+ <!--<option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>-->
+ <!--<option value="1604">濮斿鐢ㄦ枡娓呭崟</option>-->
<option value="1242">鍑哄簱鐢宠鍗�</option>
<option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
@@ -410,7 +410,7 @@
, table = layui.table
, form = layui.form
, element = layui.element;
- $("#HBarCode").focus();
+ $("#HSourceBillNo").focus();
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
//$("#HSCWHID").val(sessionStorage["HWHID"]);
@@ -1132,7 +1132,9 @@
$("#HSourceBillNo").attr("readonly", "readonly");
}
layer.load(3);
- element.tabChange('tab-MoveStockBill', '2');
+ element.tabChange('tab-MoveStockBill', '3');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
$.ajax({
url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index d8cf2d8..75fce77 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -166,6 +166,10 @@
<!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
<input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
</script>
+ <script type="text/html" id="switchTp3">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" value="{{d.HExpirationDateFlag}}" lay-skin="primary" lay-filter="HExpirationDateFlag" {{ d.HExpirationDateFlag == 1 ? 'checked' : '' }}>
+ </script>
</form>
</div>
</div>
@@ -209,15 +213,36 @@
var option2 = [];
var sWhere = "";
var sBillType = "3801";
- var HModName = "";
+ var HModName = "Gy_BarCodeBill";
var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HMaterID = "";
var HBatchNo = "";
var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
- //#endregion
-
+ //#endregion
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ var cur_title = data.elem.context.innerText;
+ if (cur_title == "鐗╂枡淇℃伅") {
+ HModName = "Gy_BarCodeBill";
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ } else if (cur_title == "鏉＄爜淇℃伅") {
+ HModName = "Gy_BarCodeBill_1";
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn1();
+
+ } else if (cur_title == "妗ｆ鍒楄〃") {
+ HModName = "Gy_BarCodeBill_2";
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn2();
+
+ }
+ })
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -226,16 +251,12 @@
//鍔犺浇宸ュ巶浠ｇ爜鏁版嵁
set_HWorksNumber();
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
- set_HBarCodeType();
+ set_HBarCodeType();
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
set_InitGrid2();
-
- //鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
- DisPlay_HideColumn1();
- DisPlay_HideColumn2();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
@@ -253,14 +274,23 @@
}
//#endregion
+ var rowdata = [{
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ }];
+
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
//澶村伐鍏锋爮
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
- var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
- console.log(NewRow);
+ var AddRow = table.cache['mainTable'];
+
+ var NewRow = {
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ };
+ //console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -296,6 +326,45 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 淇敼琛� 鏃堕棿
+
+ var data = obj.data;
+ //鐢熶骇鏃ユ湡
+ if (obj.event == 'HProduceDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ //淇濊川鏈熻嚦
+ if (obj.event == 'HExpiryDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ //#endregion
});
//鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
@@ -487,10 +556,12 @@
//鏉＄爜鐢熸垚
form.on('submit(ToolCreate)', function (data) {
+ $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
var sSubStr = JSON.stringify(table.cache['mainTable']);
//鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
return false;
}
//鑾峰彇閫夋嫨鐨勭粍缁�
@@ -737,6 +808,16 @@
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitNumber', width: 100 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅',width: 100 }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+
+ , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+ , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+ , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+ , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
+ , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+ , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
+ , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
+ , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
+
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
@@ -756,12 +837,14 @@
, toolbar: '#toolbarDemo'
, page: false
, cellMinWidth: 120
- , height: 650
+ , height: 'full-325'
, cols: [columns]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, done: function (res, curr, count) {
}
};
+ option.data = rowdata;
+ table.render(option);
}
//鍒濆鏉＄爜淇℃伅琛ㄦ牸
function set_CountGrid() {
@@ -792,12 +875,11 @@
option1 = {
id: 'mainTable1'
, elem: '#mainTable1'
- , toolbar: '#toolbarDemo1'
- , height: 500
+ , toolbar: '#toolbarDemo1'
, page: false
, limit: 500
, cellMinWidth: 120
- , height: 650
+ , height: 'full-325'
, cols: [columns]
, done: function (res, curr, count) {
}
@@ -862,12 +944,11 @@
option2 = {
id: 'mainTable2'
, elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
- , height: 500
+ , toolbar: '#toolbarDemo2'
, page: false
, limit: 500
, cellMinWidth: 120
- , height: 650
+ , height: 'full-325'
, cols: [columns]
, done: function (res, curr, count) {
}
@@ -879,8 +960,14 @@
"HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
+ , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
}];
table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
function set_AddFNew1() {
@@ -888,13 +975,22 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+ , "HExpirationDateFlag": 0
}];
table.render(option1);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
function set_AddFNew2() {
option2.data = [];
table.render(option2);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ DisPlay_HideColumn1();
+ DisPlay_HideColumn2();
}
//鏃ユ湡鏍煎紡鍖�
@@ -924,11 +1020,12 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- rows++;
+ //rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
//澶嶅埗涓�琛�
function btnCopyLine(data) {
+ data[0].HQty = '';
var copydata = JSON.stringify(data);
if (data.length <= 0) {
layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
@@ -1187,7 +1284,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option2.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option2.cols[0][i + 1]["hide"] = true;
@@ -1290,7 +1389,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1306,7 +1405,10 @@
HMaterID: checkStatus.data[0].HItemID,
HMaterNumber: checkStatus.data[0].HNumber,
HMaterName: checkStatus.data[0].HName,
- HMaterModel: checkStatus.data[0].HModel
+ HMaterModel: checkStatus.data[0].HModel,
+ HUnitID: checkStatus.data[0].HUnitID,
+ HUnitNumber: checkStatus.data[0].HUnitNumber,
+ HUnitName: checkStatus.data[0].HUnitName
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1473,9 +1575,10 @@
//鍔犺浇妗ｆ鍒楄〃
table.reload('mainTable2', {
data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
+ });
}
else {
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
layer.alert(result.Message, { icon: 5 });
}
layer.closeAll("loading");
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_EmployeeList.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_EmployeeList.html"
index efc07e7..39a4805 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_EmployeeList.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_EmployeeList.html"
@@ -92,6 +92,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
</div>
@@ -163,6 +164,9 @@
//棰勮鎸夐挳
case 'btn-Print':
get_PrintReport();
+ break;
+ //鎵撳嵃
+ case 'set_Print': set_Print();
break;
//閫�鍑烘寜閽�
case 'btn-Close':
@@ -498,6 +502,32 @@
}
//#endregion
+ //鎵撳嵃
+ function set_Print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].HItemID.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HEmployee', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_Warehouse.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_Warehouse.html"
index cfcba2a..e07b2d4 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_Warehouse.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_Warehouse.html"
@@ -92,6 +92,7 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -153,6 +154,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //鎵撳嵃
+ case 'set_Print': set_Print();
break;
//閫�鍑烘寜閽�
case 'get_Exit': parent.layui.admin.events.closeThisTabs();
@@ -458,6 +462,32 @@
}
//#endregion
+ //鎵撳嵃
+ function set_Print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].HItemID.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HWarehouse', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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/HBarPlanPrint.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/HBarPlanPrint.html"
index 834c169..4ab7ff0 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -195,6 +195,15 @@
case "HProcessExchangeBill"://宸ュ簭杩斿伐璁板綍鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchRecordBackBillList.aspx?linterid=" + value, true, "");
break;
+ case "HProcSendWork"://宸ュ簭娲惧伐鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchSendWorkBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HEmployee"://鑱屽憳鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_EmployeeList.aspx?linterid=" + value, true, "");
+ break;
+ case "HWarehouse"://浠撳簱鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_WarehouseList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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/HBarPlanPrint_GXPG.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/HBarPlanPrint_GXPG.html"
new file mode 100644
index 0000000..9d5f39f
--- /dev/null
+++ "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/HBarPlanPrint_GXPG.html"
@@ -0,0 +1,211 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鎵撳嵃</title>
+ <script src="../../CreateControl.js"></script>
+ <script src="../../GRInstall.js"></script>
+ <script src="../../GRUtility.js"></script>
+ <style type="text/css">
+ html, body {
+ margin: 0;
+ height: 100%;
+ }
+ </style>
+ <script type="text/javascript">
+
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //鍦ㄧ綉椤靛垵濮嬪姞杞芥椂鍚戞姤琛ㄦ彁渚涙暟鎹�
+ function window_onload() {
+ var ReportViewer = document.getElementById("ReportViewer");
+ // ReportViewer.Stop();
+ var Report = ReportViewer.Report;
+ //寮�鍚姤琛ㄧ敓鎴愯繘搴︽潯鏄剧ず
+ //ReportViewer.Report.ShowProgressUI = true;
+ Report.OnPrintBegin = OnPrintBegin;
+ Report.OnPrintEnd = OnPrintEnd;
+
+ ReportViewer.Start();
+ }
+ //function OnPrintEnd() {
+ // if (PrintCount == 0) {
+ // var LCStatus = sessionStorage.getItem("LCStatus");
+ // if (LCStatus == "Print")//鎵撳嵃鐘舵��
+ // {
+ // SaveLabelPrint(sessionStorage.getItem("LabelJson"));
+ // PrintCount = 1;
+ // }
+ // }
+
+ //}
+ //function OnPrintBegin() {
+
+ //}
+ </script>
+</head>
+<body>
+ <script type="text/javascript">
+ var PrintCount = 0;
+ var params = getUrlVars();
+ var value = params[params[0]];
+ var Type = params[params[1]];
+ var OpenTmp = params[params[2]];
+ var entryid = params[params[3]];
+
+
+ switch (Type) {
+
+ //case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
+ // //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ // CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ // break;
+ case "HProcessReport"://宸ュ簭姹囨姤鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_ProcessReport.aspx?linterid=" + value, true, "");
+ break;
+ case "HDepartMent"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
+ break;
+ case "HMaterial"://鐗╂枡鍩虹璧勬枡鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Material.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldProdInBill"://鍣ㄥ叿閲囪喘鍏ュ簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldProdInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldProdOutBill"://鍣ㄥ叿棰嗙敤鍑哄簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldProdOutStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldProdBackBill"://鍣ㄥ叿棰嗙敤閫�搴撳崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldProdBackStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldProdMoveBill"://鐩存帴璋冩嫧鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldProdMoveStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldMoveStockStepInBill"://鍒嗗竷寮忚皟鍏ュ崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldMoveStockStepInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldMoveStockStepOutBill"://鍒嗗竷寮忚皟鍑哄崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldMoveStockStepOutStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldOtherInBill"://鍏朵粬鍏ュ簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldOtherInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldOtherOutBill"://鍏朵粬鍑哄簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldOtherOutStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldScrapOutBill"://鍣ㄥ叿澶勭悊鍑哄簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldScrapOutStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldScrapInBill"://鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldScrapInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldRepairInBill"://鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldRepairInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldRepairOutBill"://鍣ㄥ叿鏀瑰埗鍑哄簱鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldRepairOutStockBill.aspx?linterid=" + value, true, "");
+ break;
+ //case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
+ // CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
+ // break;
+ case "HEquipMaintainPlanBill"://璁惧淇濆吇璁″垝鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipMaintainPlanBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HEquipMaintainBill"://璁惧淇濆吇璁板綍鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipMaintainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldType"://鍣ㄥ叿鍒嗙被鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldTypeBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldDotCheckBill"://鍣ㄥ叿鐐规璁板綍鏉＄爜
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldDotCheckBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldDotCheckPlanBill"://鍣ㄥ叿鐐规璁″垝鏉＄爜
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldDotCheckPlanBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldMaintainPlanBill"://鍣ㄥ叿淇濆吇璁″垝鏉＄爜
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldMaintainPlanBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldMaintainBill"://鍣ㄥ叿淇濆吇璁板綍鏉＄爜
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldMaintainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HEquipType"://璁惧鍒嗙被鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipTypeBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HEquipFileMainBill"://璁惧妗ｆ鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipFileMainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldFileMainBill"://妯″叿妗ｆ鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldFileMainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "ICStockBill"://閿�鍞��璐у崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_ICStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HGy_BarCodeBill"://鏉＄爜鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HIcmoBill"://鐢熶骇璁㈠崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HPOOrderBill"://閲囪喘璁㈠崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOOrderBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HPOInStockBill"://鏀舵枡閫氱煡鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOInStockBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HICMOBillList"://鐢熶骇璁㈠崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HICMOBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HPPBomBillList"://鐢熶骇鐢ㄦ枡娓呭崟鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPPBomBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HSeOutStockBillList"://鍙戣揣閫氱煡鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HSeOutStockBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HSeOrderBillList"://閿�鍞鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HSeOrderBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HQKPackBill"://澧欏挃瑁呯鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
+ break;
+ case "HProcessExchange"://宸ュ簭娴佽浆鍗�
+ var ListTrue = value.split(',');
+ if (ListTrue[1] == 0) {
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + ListTrue[0], true, "");
+ } else {
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + "_Sub.grf", "xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx?linterid=" + ListTrue[0], true, "");
+ }
+ break;
+ case "HPPickingBill"://鐢熶骇棰嗘枡鎷嗙爜鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HEquipResume"://璁惧灞ュ巻
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_HEquipResumeBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HSource"://鐢熶骇璧勬簮
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_SourceList.aspx?linterid=" + value, true, "");
+ break;
+ case "HProcessExchangeBill"://宸ュ簭杩斿伐璁板綍鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchRecordBackBillList.aspx?linterid=" + value, true, "");
+ break;
+ case "HProcSendWork"://宸ュ簭娲惧伐鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchSendWorkBillList.aspx?linterid=" + value + "&&entryid=" + entryid, true, "");
+ break;
+ case "HEmployee"://鑱屽憳鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_EmployeeList.aspx?linterid=" + value, true, "");
+ break;
+ case "HWarehouse"://浠撳簱鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_WarehouseList.aspx?linterid=" + value, true, "");
+ break;
+ }
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx"
new file mode 100644
index 0000000..21e8438
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx"
@@ -0,0 +1,26 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_EmployeeList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_EmployeeList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_EmployeeList where HItemID in(" + Request.Params["linterid"] + ")");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.cs"
new file mode 100644
index 0000000..0581050
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Gy_EmployeeList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.designer.cs"
new file mode 100644
index 0000000..64b4347
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_EmployeeList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Gy_EmployeeList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx"
new file mode 100644
index 0000000..ba17800
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx"
@@ -0,0 +1,26 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_WarehouseList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_WarehouseList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_WareHouseList where HItemID in(" + Request.Params["linterid"] + ")");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.cs"
new file mode 100644
index 0000000..621fb57
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Gy_WarehouseList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.designer.cs"
new file mode 100644
index 0000000..46cde24
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_WarehouseList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Gy_WarehouseList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx"
new file mode 100644
index 0000000..cbc264a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_ProcExchSendWorkBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_ProcExchSendWorkBillList where hmainid in("+Request.Params["linterid"] + ")" + "and hentryid in("+Request.Params["entryid"] + ")" ,"select 1");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs"
new file mode 100644
index 0000000..b6cbb75
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Sc_ProcExchSendWorkBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs"
new file mode 100644
index 0000000..d2652da
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_ProcExchSendWorkBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index eb24b8a..b9aabe4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -287,6 +287,13 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250 }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ , { field: '鐐夊彿', title: '鐐夊彿', width: 200 }
+ , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200 }
+ , { field: '鐑鐞嗗彿', title: '鐑鐞嗗彿', width: 200 }
+ , { field: '鍘傚晢', title: '鍘傚晢', width: 200 }
+ , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200 }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200 }
, { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160 }
, { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160 }
@@ -308,7 +315,7 @@
, { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200 }
, { field: '澶囨敞', title: '澶囨敞', width: 200 }
, { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200 }
, { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200 }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115 }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index b9b1bc4..6b69e4b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -407,6 +407,8 @@
var HModName = "MES_StationOutBill_PDA";
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
+ $('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤鏄庣粏鎸夐挳
+
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
* 2.鏈夋簮鍗曟柊澧�
@@ -694,6 +696,7 @@
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrgID": data.缁勭粐,
+ "HPRDOrg": data.缁勭粐鍚嶇О,
"lngBillSubKey": data.hsubid,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
@@ -719,7 +722,10 @@
"HProcExchHinteID": data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HPRDOrgID": data.缁勭粐
+ "HPRDOrgID": data.缁勭粐,
+ "HPRDOrg": data.缁勭粐鍚嶇О,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
@@ -860,6 +866,8 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
}
else {
layer.close(index);
@@ -1340,10 +1348,16 @@
data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
success: function (data1) {
if (data1.data.length > 1) {
+ $('#Detail').removeClass("layui-btn-disabled").attr("disabled", false);//鏄庣粏鎸夐挳鍚敤
+
var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
var HProcNo = $("#HProcNo").val();
var HPlanQty = $("#HPlanQty").val();
var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ var HProcExchHinteID = $("#HProcExchHinteID").val();
+ var HInterID = $("#HInterID").val();
layer.open({
type: 2
@@ -1352,7 +1366,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+ , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1392,8 +1406,7 @@
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
}
- txtHBarCode_KeyDown(HBarCode);
-
+ txtHBarCode_KeyDown(HBarCode);
});
//#endregion
@@ -1405,6 +1418,7 @@
var HProcID = $("#HProcID").val();
var HMaterID = $("#HMaterID").val();
var HProcExchHinteID = $("#HProcExchHinteID").val();
+ var HInterID = $("#HInterID").val();
layer.open({
type: 2
@@ -1413,7 +1427,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+ , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1492,7 +1506,7 @@
layer.open({
type: 2
, area: ['80%', '80%']
- , title: '鏈珯宸ュ簭'
+ , title: '鐢熶骇鐝粍'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html"
index 02d39ae..879d395 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html"
@@ -65,7 +65,8 @@
<th>娴佹按鍙�</th>
<td class="bz_td">
<input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="娴佹按鍙�" style="border-radius:50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HBillNo_bak" id="HBillNo_bak" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HBillNo_bak" id="HBillNo_bak" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HInterID" id="HInterID" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -140,13 +141,13 @@
}
return vars;
}
- var params = getUrlVars();
- console.log(params);
+ var params = getUrlVars();
$("#HBillNo_bak").val(params[params[0]]);
$("#HProcNo").val(params[params[2]]);
- $("#HWorkProcName").val(params[params[4]]);
- $("#HPlanQty").val(params[params[3]]);
+ $("#HPlanQty").val(params[params[3]]);
+ $("#HWorkProcID").val(params[params[4]]);
+ $("#HInterID").val(params[params[8]]);
var HProcExchBillNo = params[params[1]];
var HWorkProcID = params[params[4]];
@@ -266,9 +267,23 @@
layer.close(index);
}
});
- }
+ }
});
//#endregion
+
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ switch (field) {
+ case 'HQty':
+ obj.update({
+ HMoney: HProcPrice * HQty //宸ヨ祫=宸ヤ环 * 鏁伴噺
+ });
+ break;
+ }
+ });
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -278,8 +293,9 @@
{ field: 'HMoney', title: '宸ヨ祫', width: 70 }
, { field: 'HWorkEmpID', title: '鑱屽憳ID', width: 60, hide: true }
, { field: 'HWorkName', title: '鑱屽憳', edit: 'text', event: "HWorkName" }
+ , { field: 'HRate', title: '鑱屽憳绯绘暟', width: 60, hide: true }
, { field: 'HProcPrice', title: '宸ヤ环', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 60, edit: 'text', totalRow: true}
+ , { field: 'HQty', title: '鏁伴噺', width: 60, edit: 'text', event:'HQty',totalRow: true}
, { field: 'HWorkSourceID', title: '鐢熶骇璧勬簮ID', width: 60, hide: true }
, { field: 'HWorkSourceName', title: '鐢熶骇璧勬簮', width: 60 }
, { type: 'numbers', title: '搴忓彿', width: 50 }
@@ -309,7 +325,10 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
+ $("#HWorkProcName").val(result.data[0]["宸ュ簭鍚嶇О"]);
+
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ //"HWorkProcName": data.宸ュ簭鍚嶇О
//"HBillNo": data.鍗曟嵁鍙�
//, "HDate": formatDate(data.鏃ユ湡)
});
@@ -319,7 +338,7 @@
for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": data[i].鐢熶骇璧勬簮鍚嶇О,
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID": data[i].鐢熶骇璧勬簮ID, "HWorkSourceNumber": "", "HWorkSourceName": data[i].鐢熶骇璧勬簮鍚嶇О,
"HQty": 0, "HRate": 0, "HProcPrice": data[i].宸ヤ环, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
}
)
@@ -344,11 +363,18 @@
//#region 鎻愪氦鏂规硶
function Saver(data) {
var num = [];
+ var number = 0;
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
+ number = parseInt(number) + parseInt(num[i].HQty);
}
+ }
+
+ if ($("#HPlanQty").val() < number) {
+ layer.msg("鏁伴噺瓒呭嚭锛�");
+ return;
}
var sMainStr = JSON.stringify(data.field);
@@ -406,9 +432,11 @@
$("#HPlanQty").focus();
obj.update({
"HWorkEmpID": result.data[0].HItemID,
- "HWorkName": result.data[0].鑱屽憳鍚嶇О
+ "HWorkName": result.data[0].鑱屽憳鍚嶇О,
+ "HRate": result.data[0].鑱屽憳绯绘暟
})
layer.close(index);
+ return;
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
index e8895ea..35c7a48 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_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
@@ -704,16 +704,21 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var array = [];
+ var interid = [];
+ var ieid = [];
for (let i = 0; i < data.length; i++) {
array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
-
+ interid.push(checkStatus.data[i]["hmainid"]);
+ ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
//鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
- if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
- layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
- return;
- }
+ //if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
+ // layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
+ // return;
+ //}
}
var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
+ var HInterID = interid.join(",");
+ var HIeID = ieid.join(",");
if (checkStatus.data.length >= 1) {
if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
layer.open({
@@ -724,7 +729,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["100%", "100%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + HEntryID, "yes"]
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
index 96596a5..468f0b3 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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
@@ -52,7 +52,7 @@
<div class="layui-btn-group">
<button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
</div>
</div>
@@ -265,6 +265,7 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
}
//宸ュ簭娲惧伐鏂板
@@ -302,7 +303,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcNo": 0, "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
+ "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
"HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0
@@ -413,6 +414,7 @@
HMaterName: checkStatus.data[0].HName
, HMaterID: checkStatus.data[0].HItemID
, HMaterNumber: checkStatus.data[0].HNumber
+ , HMaterModel: checkStatus.data[0].HModel
});
layer.close(layer.index);
@@ -613,72 +615,7 @@
}
})
- });
-
- //鎵撳嵃
- form.on('submit(btn_print)', function () {//浜у搧
-
- var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and 鍗曟嵁鍙�='" + $("#HBillNo").val() + "' ";
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- var hinterid = "";
- if (data1.data.length != 0) {
- hinterid = data1.data[0]["hmainid"];
- }
- layer.close(ajaxLoad);
-
- if (hinterid != "") {
- $.ajax({
- url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
- type: "GET",
- data: { "HProcExchHinteID": hinterid },
- success: function (res) {
- if (res.count == 1) {
- if (res.data.length != 0) {
- hinterid += ",1";
- } else {
- hinterid += ",0";
- }
-
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hinterid + '&MyMsg=' + hinterid + '&Type=HProcessExchange', 'yes']
- , resize: false
- })
-
- } else {
- layer.close(ajaxLoad);
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
-
- } else {
- layer.msg("璇峰厛淇濆瓨,鍦ㄨ繘琛屾墦鍗�!");
- }
- } else {
- layer.close(ajaxLoad);
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- });
- //#endregion
+ });
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
@@ -719,9 +656,11 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�' }
+ , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
, { field: 'HMaterID', title: '浜у搧ID', hide: true }
, { field: 'HMaterNumber', title: '浜у搧浠ｇ爜', edit: 'text', event: "HMaterCheck" }
, { field: 'HMaterName', title: '浜у搧鍚嶇О' }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', hide: true }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitCheck" }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О' }
@@ -773,7 +712,7 @@
}
};
option.data = [{
- "HProcNo": 0, "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
+ "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
"HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0
@@ -784,7 +723,7 @@
//鏌ヨ宸ュ簭娴佽浆鍗�
function get_ProcessExchange() {
- var sWhere = " where hmainid=" + linterid + " and HEntryID in (" + HEntryID + ")";
+ var sWhere = " where hmainid in (" + linterid + ") and HEntryID in (" + HEntryID + ") and ieid in (" + HIeID + ")";
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Sc_ProcExchSendWorkBill/GetProcessExchangeBillSub',
@@ -810,7 +749,7 @@
for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HProcNo": result.data[i]["娴佹按鍙�"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["鍗曚綅"],
+ "HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["鍗曚綅"],
"HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮"], "HWorkerID": result.data[i]["HWorkerID"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸�"],
"HGroupID": result.data[i]["HGroupID"], "HGroupNumber": result.data[i]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
"HPlanEndDate": new Date(), "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"]
@@ -901,10 +840,10 @@
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
- "HProcNo": result.data[0]["娴佹按鍙�"], "HMaterID": result.data[0]["浜у搧ID"], "HMaterNumber": result.data[0]["浜у搧浠ｇ爜"], "HMaterName": result.data[0]["浜у搧鍚嶇О"], "HUnitID": result.data[0]["鍗曚綅ID"], "HUnitNumber": result.data[0]["璁￠噺鍗曚綅浠ｇ爜"], "HUnitName": result.data[0]["璁￠噺鍗曚綅鍚嶇О"],
- "HSourceID": result.data[0]["鐢熶骇璧勬簮ID"], "HSourceNumber": result.data[0]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[0]["鐢熶骇璧勬簮鍚嶇О"], "HWorkerID": result.data[0]["鎿嶄綔宸D"], "HWorkerNumber": result.data[0]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[0]["鎿嶄綔宸ュ悕绉�"],
- "HGroupID": result.data[0]["鐝粍ID"], "HGroupNumber": result.data[0]["鐝粍浠ｇ爜"], "HGroupName": result.data[0]["鐝粍鍚嶇О"], "HPlanQty": result.data[0]["娴佽浆鍗℃暟閲�"], "HQty": result.data[0]["娲惧伐鏁伴噺"], "HBatchNo": result.data[0]["鎵规"], "HPlanBeginDate": result.data[0]["瑕佹眰寮�宸ユ棩鏈�"],
- "HPlanEndDate": result.data[0]["瑕佹眰瀹屽伐鏃ユ湡"]
+ "HProcNo": result.data[i]["娴佹按鍙�"], "HMaterID": result.data[i]["浜у搧ID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["鍗曚綅ID"], "HUnitNumber": result.data[i]["璁￠噺鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["璁￠噺鍗曚綅鍚嶇О"],
+ "HSourceID": result.data[i]["鐢熶骇璧勬簮ID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮鍚嶇О"], "HWorkerID": result.data[i]["鎿嶄綔宸D"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸ュ悕绉�"],
+ "HGroupID": result.data[i]["鐝粍ID"], "HGroupNumber": result.data[i]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍鍚嶇О"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": result.data[i]["娲惧伐鏁伴噺"], "HBatchNo": result.data[i]["鎵规"], "HPlanBeginDate": result.data[i]["瑕佹眰寮�宸ユ棩鏈�"],
+ "HPlanEndDate": result.data[i]["瑕佹眰瀹屽伐鏃ユ湡"]
});
}
option.data = rowdata;
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_ProcessSendWorkList.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_ProcessSendWorkList.html"
index 1d0c2ed..8cbe3c7 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_ProcessSendWorkList.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_ProcessSendWorkList.html"
@@ -106,8 +106,9 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
@@ -167,6 +168,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //鎵撳嵃
+ case 'btn_print': get_print();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -439,6 +443,34 @@
}
+ //鎵撳嵃
+ function get_print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ var arr = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].hmainid.toString());
+ arr.push(data[i].hentryid.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList _GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&entryid=' + arr.toString(), 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
//瀹℃牳
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -534,7 +566,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
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 5011133..a670cf9 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"
@@ -346,6 +346,8 @@
, element = layui.element;
var HStockOrgID = sessionStorage["OrganizationID"]
var option = [];
+ //鍏夋爣榛樿鍦ㄦ簮鍗曞彿浣嶇疆涓�
+ $("#HSourceBillNo").focus();
//婧愬崟鎵捐揣鍒楄〃
var ZHOption = {
@@ -1640,6 +1642,8 @@
//$("#HDeptName").val(result.data[0].HDeptName);
HSourceFlag = true;
element.tabChange('tab-SellOutBill', '3');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
//table.reload('wl-table', {
// where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
//});
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 9c50061..8736573 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -64,7 +64,7 @@
<div class="layui-col-xs8">
<select name=" HBillType" id="HBillType">
<option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
- <option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
+ <option value="1214" selected>鐢熶骇鍙戞枡閫氱煡鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -416,6 +416,16 @@
$("#HBillerID").hide();
var HSourceFlag = sessionStorage["SourceFlag"];//婧愬崟宸叉爣璁�
+ //鍏夋爣榛樿鏄剧ず鍦ㄥ師鍗曞彿浣嶇疆
+ $("#HSourceBillNo").focus();
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛�
+ element.on('tab(tab-MateOutBill)', function (data) {
+ var cur_title = data.elem.context.innerText;
+ if (cur_title == "婧愬崟淇℃伅") {
+ $("#HSourceBillNo").focus();
+ }
+ })
//鑾峰彇鍙傛暟锛堣幏鍙栬烦杞繃鏉ョ殑鍙傛暟锛�
function getUrlVars() {
@@ -1227,10 +1237,12 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("readonly", "readonly");
}
- element.tabChange('tab-MateOutBill', '2');
+ element.tabChange('tab-MateOutBill', '3');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();//鎾斁澹伴煶
- layer.load(3)
+ layer.load(3)
$.ajax({
url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
type: "GET",
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 1583f34..a6fdc12 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -47,14 +47,14 @@
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-ProductlnBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;" class="layui-this">鍗曟嵁淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
<li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
<li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
+ <div class="layui-tab-item ">
<div class="layui-form-item">
<!--<div class="layui-row">
<div class="layui-col-xs3">
@@ -113,7 +113,7 @@
</div>
</div>
</div>
- <div class="layui-tab-item">
+ <div class="layui-tab-item layui-show" >
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
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 e37df51..1c30243 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"
@@ -51,15 +51,15 @@
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;" class="layui-this">鍗曟嵁淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
<li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
<li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--婧愬崟淇℃伅-->
- <div class="layui-tab-item layui-show">
+ <div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -86,7 +86,7 @@
</div>
</div>
<!--鍗曟嵁淇℃伅-->
- <div class="layui-tab-item">
+ <div class="layui-tab-item" layui-show>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -546,8 +546,10 @@
pFocus.select();
}
else {
- element.tabChange('tab-POStockInBill', '1');
- var pFocus = $("#HSourceBillNo");
+ //榛樿杩涘叆鍗曟嵁淇℃伅椤电
+ element.tabChange('tab-POStockInBill', '2');
+ //榛樿鍏夋爣鏄剧ず鍦ㄦ潯鐮侀噷闈�
+ var pFocus = $("#HBarCode");
pFocus.focus();
pFocus.select();
}
--
Gitblit v1.9.1