From d4e2d5e93bdee0dd3538714b83745fd16dc4a07e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 20 八月 2025 16:26:33 +0800
Subject: [PATCH] PDA 条码查询页面 添加 条码出库日期 客户 销售出库单号 查询条件
---
WebTM/WebTM.csproj.user | 2
WebTM/views/WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html | 311 ++++++++++++++++++++++++++++++--------
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 159 +++++++++++++------
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | 2
5 files changed, 355 insertions(+), 121 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 7ed83cb..8cc4879 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
index c6f8bd8..01193df 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鏉＄爜鏌ヨ</title>
@@ -21,26 +22,60 @@
}
</style>-->
</head>
+
<body>
<div class="layui-fluid" style="padding: 0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 0px; height:900px;">
+ <div class="layui-card-body" style="padding: 0px; height: auto;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-form-item" style="padding:15px;margin:0px">
- <div class="layui-row" style="width:350px;">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:50px;padding-left:0px;">鏉″舰鐮�:</label>
+ <div class="layui-row"
+ style="display: flex; flex-direction: row; gap: 10px 0; flex-wrap: wrap;">
+ <div class="layui-form-inline">
+ <label class="layui-form-label"
+ style="width:7em;padding-left:0px;text-align: right;">鏉″舰鐮�:</label>
+ <input style="width:230px;" type="text" name="HBarCode" id="HBarCode"
+ lay-verify="HBarCode"
+ onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"
+ autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
- <div class="layui-col-xs8" >
- <input style="width:230px;" type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <div class="layui-form-inline">
+ <label class="layui-form-label"
+ style="width:7em;padding-left:0px;text-align: right;">鏉＄爜鍑哄簱鏃ユ湡:</label>
+ <input class="layui-input" style="width:230px;" type="text" name="HBarCodeOutDate" id="HBarCodeOutDate"
+ lay-verify="HBarCodeOutDate"
+ onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"
+ autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
- <div class="layui-col-xs1">
- <button style="width: 60px;" type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode" id="cmdHBarCode">鏌ヨ</button>
+ <div class="layui-form-inline">
+ <label class="layui-form-label"
+ style="width:7em;padding-left:0px;text-align: right;">瀹㈡埛:</label>
+ <input style="width:230px;" type="text" name="HCustomerName" id="HCustomerName"
+ lay-verify="HCustomerName"
+ onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"
+ autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-form-inline">
+ <label class="layui-form-label"
+ style="width:7em;padding-left:0px;text-align: right;">閿�鍞嚭搴撳崟鍙�:</label>
+ <input style="width:230px;" type="text" name="HSellOutBillNo" id="HSellOutBillNo"
+ lay-verify="HSellOutBillNo"
+ onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"
+ autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <!-- <div class="layui-form-inlin">
+ <button style="width: 60px;" type="button" lay-submit="" class="layui-btn"
+ lay-filter="cmdHBarCode" id="cmdHBarCode">鏌ヨ</button>
+ </div> -->
+ <div class="layui-form-inlin">
+ <button style="width: 60px;" type="button" lay-submit="" class="layui-btn"
+ lay-filter="cmdQuery" id="cmdQuery">鏌ヨ</button>
</div>
</div>
</div>
-
- <div class="layui-tab layui-col-xs12" lay-filter="tab-Gy_BarCodeBill_QiaoYi_PDA">
+
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-Gy_BarCodeBill_QiaoYi_PDA"
+ style="background-color: #fff; height: calc(100% + 1em);">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">鍩烘湰淇℃伅</li>
</ul>
@@ -50,212 +85,265 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">閿�鍞鍗�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">閿�鍞鍗�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HSeOrderBillNo" id="HSeOrderBillNo" lay-verify="HSeOrderBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ <input name="HSeOrderBillNo" id="HSeOrderBillNo" lay-verify="HSeOrderBillNo"
+ disabled="disabled" autocomplete="off" class="layui-input mobile">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width: 60px; padding-left: 0px;">鐢熶骇璁㈠崟:</label>
+ <label class="layui-form-label"
+ style="width: 60px; padding-left: 0px;">鐢熶骇璁㈠崟:</label>
</div>
<div class="layui-col-xs5" style="text-align:left;">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
- <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0" autocomplete="off" class="layui-input" style="display : none">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo"
+ lay-verify="HSourceBillNo" disabled="disabled" autocomplete="off"
+ class="layui-input mobile">
+ <input type="hidden" name="HSourceInterID" id="HSourceInterID"
+ lay-verify="HSourceInterID" value="0" autocomplete="off"
+ class="layui-input" style="display : none">
</div>
- <div class="layui-col-xs3" style="margin-left: 5px; width: 70px; position: absolute; right: 35px;">
- <input type="text" name="HICMOBillSubQty" id="HICMOBillSubQty" lay-verify="HICMOBillSubQty" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ <div class="layui-col-xs3"
+ style="margin-left: 5px; width: 70px; position: absolute; right: 35px;">
+ <input type="text" name="HICMOBillSubQty" id="HICMOBillSubQty"
+ lay-verify="HICMOBillSubQty" disabled="disabled" autocomplete="off"
+ class="layui-input mobile">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佽浆鍗�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">娴佽浆鍗�:</label>
</div>
<div class="layui-col-xs5" style="text-align:left;">
- <input name="HOrderBillNo" id="HOrderBillNo" lay-verify="HOrderBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
- <input type="hidden" name="HOrderInterID" id="HOrderInterID" lay-verify="HOrderInterID" value="0" autocomplete="off" class="layui-input" style="display : none">
+ <input name="HOrderBillNo" id="HOrderBillNo" lay-verify="HOrderBillNo"
+ disabled="disabled" autocomplete="off" class="layui-input mobile">
+ <input type="hidden" name="HOrderInterID" id="HOrderInterID"
+ lay-verify="HOrderInterID" value="0" autocomplete="off"
+ class="layui-input" style="display : none">
</div>
- <div class="layui-col-xs3" style="margin-left: 5px; width: 70px; position: absolute; right: 35px;">
- <input name="HProcessExchangeBillMainQty" id="HProcessExchangeBillMainQty" lay-verify="HProcessExchangeBillMainQty" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ <div class="layui-col-xs3"
+ style="margin-left: 5px; width: 70px; position: absolute; right: 35px;">
+ <input name="HProcessExchangeBillMainQty" id="HProcessExchangeBillMainQty"
+ lay-verify="HProcessExchangeBillMainQty" disabled="disabled"
+ autocomplete="off" class="layui-input mobile">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">闂ㄥ箙:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">闂ㄥ箙:</label>
</div>
<div class="layui-col-xs8">
- <input name="HWidth" id="HWidth" lay-verify="HWidth" autocomplete="off" class="layui-input">
+ <input name="HWidth" id="HWidth" lay-verify="HWidth" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏嬮噸:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鍏嬮噸:</label>
</div>
<div class="layui-col-xs8">
- <input name="HWeight" id="HWeight" lay-verify="HWeight" autocomplete="off" class="layui-input">
+ <input name="HWeight" id="HWeight" lay-verify="HWeight" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡缂栫爜:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鐗╂枡缂栫爜:</label>
</div>
<div class="layui-col-xs8">
- <input name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" class="layui-input">
+ <input name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鍚嶇О:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鐗╂枡鍚嶇О:</label>
</div>
<div class="layui-col-xs8">
- <input name="HName" id="HName" lay-verify="HName" autocomplete="off" class="layui-input">
+ <input name="HName" id="HName" lay-verify="HName" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">瑙勬牸鍨嬪彿:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">瑙勬牸鍨嬪彿:</label>
</div>
<div class="layui-col-xs8">
- <input name="HModel" id="HModel" lay-verify="HModel" autocomplete="off" class="layui-input">
+ <input name="HModel" id="HModel" lay-verify="HModel" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">瀹㈡埛:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">瀹㈡埛:</label>
</div>
<div class="layui-col-xs8">
- <input name="HCusName" id="HCusName" lay-verify="HCusName" autocomplete="off" class="layui-input">
- <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0" autocomplete="off" class="layui-input" style="display : none">
+ <input name="HCusName" id="HCusName" lay-verify="HCusName"
+ autocomplete="off" class="layui-input">
+ <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0"
+ autocomplete="off" class="layui-input" style="display : none">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">闀垮害:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">闀垮害:</label>
</div>
<div class="layui-col-xs8">
- <input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">閲嶉噺:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">閲嶉噺:</label>
</div>
<div class="layui-col-xs8">
- <input name="HMaterialJQty" id="HMaterialJQty" lay-verify="HMaterialJQty" autocomplete="off" class="layui-input">
+ <input name="HMaterialJQty" id="HMaterialJQty" lay-verify="HMaterialJQty"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">涓氬姟鍛�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">涓氬姟鍛�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HEmpName" id="HEmpName" lay-verify="HEmpName" autocomplete="off" class="layui-input">
- <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0" autocomplete="off" class="layui-input" style="display : none">
+ <input name="HEmpName" id="HEmpName" lay-verify="HEmpName"
+ autocomplete="off" class="layui-input">
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0"
+ autocomplete="off" class="layui-input" style="display : none">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鍒跺崟浜�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+ <input name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟鏃ユ湡:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鍒跺崟鏃ユ湡:</label>
</div>
<div class="layui-col-xs8">
- <input name="HMakeDate" id="HMakeDate" lay-verify="HMakeDate" autocomplete="off" class="layui-input">
+ <input name="HMakeDate" id="HMakeDate" lay-verify="HMakeDate"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鏉″舰鐮�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ <input name="HBarCode" id="HBarCode" lay-verify="HBarCode"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵规:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鎵规:</label>
</div>
<div class="layui-col-xs8">
- <input name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo" autocomplete="off" class="layui-input">
+ <input name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">淇濊川鏈熻嚦:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">淇濊川鏈熻嚦:</label>
</div>
<div class="layui-col-xs8">
- <input name="HExpiryDate" id="HExpiryDate" lay-verify="HExpiryDate" autocomplete="off" class="layui-input">
+ <input name="HExpiryDate" id="HExpiryDate" lay-verify="HExpiryDate"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">MTO鍙�:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">MTO鍙�:</label>
</div>
<div class="layui-col-xs8">
- <input name="HMTONo" id="HMTONo" lay-verify="HMTONo" autocomplete="off" class="layui-input">
+ <input name="HMTONo" id="HMTONo" lay-verify="HMTONo" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3" style="text-align:left;">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鏍囩鏁伴噺:</label>
+ <label class="layui-form-label"
+ style="width:60px;padding-left:0px;">鏍囩鏁伴噺:</label>
</div>
<div class="layui-col-xs8">
- <input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <input name="HQty" id="HQty" lay-verify="HQty" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
</div>
- <div class="layer-footer" style="z-index: 10; position:absolute; right:35px;height:50px">
- <div class="layui-col-xs3" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ <div class="layer-footer"
+ style="z-index: 10; box-sizing: border-box; display:flex; justify-content: right; padding-right: 30px; padding-top: 15px">
+ <div class="layui-form-row">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="cmdCancel">閫�鍑�</button>
</div>
</div>
</div>
</div>
-
+
</form>
</div>
</div>
@@ -271,10 +359,11 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , laydate = layui.laydate;
var HBarCode_In = $('#HBarCode_In').val()
var OperationType = 0;//鎿嶄綔绫诲瀷
- var option = [];
+ var option = [];
//#endregion
@@ -283,6 +372,10 @@
set_ClearBill();
function set_ClearBill() {
+ // 娓叉煋
+ laydate.render({
+ elem: '#HBarCodeOutDate'
+ });
element.tabChange('tab-Gy_BarCodeBill_QiaoYi_PDA', '1');
var pFocus = $("#HBarCode_In");
pFocus.focus(); //鑾峰彇鍏夋爣
@@ -346,7 +439,15 @@
getInfoByBarcode();
layer.closeAll("loading");
});
- //#endregion
+ //#endregion
+
+ //#region
+ form.on('submit(cmdQuery)', function (data) {
+ layer.load(3)
+ get_QueryInfo();
+ layer.closeAll("loading");
+ })
+ //#endregion
//##region 鐩戝惉
$('#HBarCode').on('keydown', function (event) {
@@ -389,7 +490,7 @@
"HEmpName": data.涓氬姟鍛�,
"HEmpID": data.HEmpID,
"HMaker": data.鍒跺崟浜�,
- "HMakeDate": Pub_Format(data.鍒跺崟鏃ユ湡,"yyyy-MM-dd hh:mm:ss"),
+ "HMakeDate": Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss"),
"HBatchNo": data.鎵规鍙�,
"HExpiryDate": data.淇濊川鏈熻嚦,
"HMTONo": data.HMTONo,
@@ -401,7 +502,7 @@
////$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
////$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
@@ -419,16 +520,86 @@
});
}
- //#region 閫�鍑哄姛鑳芥帶浠�
+ //#region 鏌ヨ 閫氳繃鏉″舰鐮�/鏉＄爜鍑哄簱鏃ユ湡/瀹㈡埛/閿�鍞嚭搴撳崟鍙�
+ function get_QueryInfo() {
+ var HBarCode = $('#HBarCode').val();
+ var HBarCodeOutDate = $('#HBarCodeOutDate').val();
+ var HCustomerName = $('#HCustomerName').val();
+ var HSellOutBillNo = $('#HSellOutBillNo').val();
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "WEBSController/GetGy_BarCodeBill_QiaoYi_PDA_Json",
+ type: "GET",
+ data: {
+ sBarCode: HBarCode, sBarCodeOutDate: HBarCodeOutDate, sCustomerName: HCustomerName,
+ sSellOutBillNo: HSellOutBillNo
+ },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSourceBillNo": data.鐢熶骇璁㈠崟鍙�,
+ "HSourceInterID": data.HSourceInterID,
+ "HOrderBillNo": data.娴佽浆鍗″彿,
+ "HOrderInterID": data.HOrderInterID,
+ "HSeOrderBillNo": data.閿�鍞鍗曞彿,
+ "HWidth": data.闂ㄥ箙,
+ "HWeight": data.鍏嬮噸,
+ "HNumber": data.HNumber,
+ "HName": data.HName,
+ "HModel": data.瑙勬牸鍨嬪彿,
+ "HCusName": data.瀹㈡埛,
+ "HCusID": data.HCusID,
+ "HQty": data.闀垮害,
+ "HMaterialJQty": data.閲嶉噺,
+ "HEmpName": data.涓氬姟鍛�,
+ "HEmpID": data.HEmpID,
+ "HMaker": data.鍒跺崟浜�,
+ "HMakeDate": Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss"),
+ "HBatchNo": data.鎵规鍙�,
+ "HExpiryDate": data.淇濊川鏈熻嚦,
+ "HMTONo": data.HMTONo,
+ "HQty": data.鏍囩鏁伴噺,
+ "HBarCode": data.鏉″舰鐮�,
+ "HICMOBillSubQty": data.鐢熶骇璁㈠崟瀛愯〃鏁伴噺,
+ "HProcessExchangeBillMainQty": data.娴佽浆鍗′富琛ㄦ暟閲�,
+ });
+ ////$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ ////$("#HBarCode").css("background-color", "#efefef4d");
+
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
});
})
- //#endregion
-
- })
+ //#endregion
+
+ })
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
index 5547335..8a9cb83 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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
@@ -58,7 +58,7 @@
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<!--<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>-->
</ul>
- <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�</b></h1>
+ <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�-姣涘皷</b></h1>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
index 496ef0b..4bf65c9 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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
@@ -58,7 +58,7 @@
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<!--<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>-->
</ul>
- <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�</b></h1>
+ <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�-缇婃瘺鏌撹壊</b></h1>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
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_MateOutBillList.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_MateOutBillList.html"
index e920c59..bd360cb 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_MateOutBillList.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_MateOutBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐢熶骇棰嗘枡鍗曞垪琛�</title>
@@ -23,6 +24,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -39,63 +41,75 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HBillNo"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2"
+ id="HBillno2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">杞﹂棿鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HDeptName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HDeptName"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">棰滆壊浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMainMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ id="HMainMaterNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">棰滆壊鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMainMaterName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ id="HMainMaterName" style="width:190px;">
</div>
</div>
<!--<div class="layui-inline">
@@ -113,7 +127,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMaker" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HMaker"
+ style="width:190px;">
</div>
</div>
<div style="display:block;">
@@ -123,19 +138,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -143,26 +164,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护1</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -170,26 +198,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护2</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -197,7 +232,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -237,7 +273,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -257,12 +293,12 @@
var HModName = "Kf_MateOutBillList";
//#endregion
- //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1204";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
//#endregion
- var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", 'HMaterRuleExternType'];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -452,7 +488,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery( )
+ get_FastQuery()
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
@@ -480,12 +516,12 @@
, { field: '涓讳骇鍝佸悕绉�', title: '棰滆壊', width: 160, sort: true }
, { field: '瑙勬牸鍨嬪彿1', title: '瑙勬牸鍨嬪彿1', width: 160, sort: true }
, { field: '瑙勬牸鍨嬪彿2', title: '瑙勬牸鍨嬪彿2', width: 160, sort: true }
- , { field: '姘村啿', title: '姘村啿', width: 160, sort: true, totalRow: true}
+ , { field: '姘村啿', title: '姘村啿', width: 160, sort: true, totalRow: true }
, { field: '鏈洪��', title: '鏈洪��', width: 160, sort: true, totalRow: true }
- , { field: '鍙暟', title: '鍙暟', width: 160, sort: true, totalRow: true}
- , { field: '閲嶉噺', title: '甯冮噸', width: 160, sort: true, totalRow: true}
- , { field: '姘存瘮', title: '姘存瘮', width: 160, sort: true, totalRow: true}
- , { field: '姘撮噺', title: '姘撮噺', width: 160, sort: true, totalRow: true}
+ , { field: '鍙暟', title: '鍙暟', width: 160, sort: true, totalRow: true }
+ , { field: '閲嶉噺', title: '甯冮噸', width: 160, sort: true, totalRow: true }
+ , { field: '姘存瘮', title: '姘存瘮', width: 160, sort: true, totalRow: true }
+ , { field: '姘撮噺', title: '姘撮噺', width: 160, sort: true, totalRow: true }
, { field: '琛ㄥご澶囨敞', title: '澶囨敞', width: 160, sort: true }
, { field: '棰嗘枡鐘舵��', title: '棰嗘枡鐘舵��', width: 160 }
//, { field: 'hsubid', title: 'hsubid', hide: true , sort: true}
@@ -755,6 +791,14 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ if (data.HMaterRuleExternType) {
+ if (data.HMaterRuleExternType == '缇婃瘺') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ } else if (data.HMaterRuleExternType == '姣涘皷') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ }
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -764,7 +808,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: content //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
@@ -776,7 +820,7 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
@@ -792,7 +836,7 @@
url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -815,7 +859,8 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -894,7 +939,16 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+ debugger
var linterid = data[0].hmainid.toString();
+ var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ if (data[0].HMaterRuleExternType) {
+ if (data[0].HMaterRuleExternType == '缇婃瘺') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ } else if (data[0].HMaterRuleExternType == '姣涘皷') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ }
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -904,7 +958,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , content: content
, resize: false,
end: function () {
//get_FastQuery(table, option);
@@ -926,6 +980,14 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
+ var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ if (data[0].HMaterRuleExternType) {
+ if (data[0].HMaterRuleExternType == '缇婃瘺') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ } else if (data[0].HMaterRuleExternType == '姣涘皷') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ }
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -935,7 +997,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , content: content
, resize: false,
end: function () {
//get_FastQuery(table, option);
@@ -1745,7 +1807,7 @@
//#endregion
- //#endregion
+ //#endregion
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
@@ -1787,4 +1849,5 @@
//#endregion
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1