From f6b85efadafa21099fe4fa8514518f1e023f4a91 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 九月 2025 08:21:55 +0800
Subject: [PATCH] 1
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 8
WebTM/WebTM.csproj.user | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 11
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 82
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 10
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 7
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 8
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 521 ++++++-----
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillSync.html | 564 ++++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 8
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html | 39
WebTM/views/PublicPage/HSourceReportHtml.html | 17
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 9
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 8
WebTM/views/index_QiaoYi.html | 14
WebTM/views/home/console_Mobile.html | 6
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | 98 +-
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 8
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_AutoBarCode_PDA.html | 745 ++++++++++++++++
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillSync.html | 562 ++++++++++++
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 10
WebTM/WebTM.csproj | 3
23 files changed, 2,391 insertions(+), 350 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 55b04ed..a0e3139 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -368,6 +368,7 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_CusBar_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_AutoBarCode_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
@@ -889,6 +890,8 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
+ <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBillSync.html" />
+ <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBillSync.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Sc_ProcessExchangeIssueBillList_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSync.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3c987b4..7ed83cb 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<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>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 8c3094c..0dc9a55 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -380,7 +380,7 @@
$("#HProcExchBillNoHidden").show();
HModName = "ProductInBill_1202";
break;
- case '閲囪喘鍏ュ簱':
+ case '閲囪喘鍏ュ簱鍗�':
HModName = "POStockInBill_1201";
break;
case '閿�鍞��璐�':
@@ -625,6 +625,21 @@
}
return sWhere;
break;
+ case "閲囪喘鍏ュ簱鍗�":
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ return sWhere;
+ break;
case '閫�璐ч�氱煡鍗�':
return sWhere;
break;
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_AutoBarCode_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_AutoBarCode_PDA.html"
new file mode 100644
index 0000000..8bf7348
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_AutoBarCode_PDA.html"
@@ -0,0 +1,745 @@
+锘�<!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, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩存帴璋冩嫧鍗�-鍏嶆壂鐮�</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>
+ <div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MoveStockBill_AutoBarCode_PDA">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--琛ㄥご淇℃伅-->
+ <div class="layui-tab-item">
+ <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>
+ </div>
+ <div class="layui-col-xs9">
+ <select name="HMainSourceBillType" id="HMainSourceBillType">
+ <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
+ <option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HBillerID" id="HBillerID">
+ <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+ <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var HBillType = '1207'
+ var HRedBlueFlag = false
+ var HMaker = sessionStorage["HUserName"]
+ var HBillerID = sessionStorage["HBillerID"]
+ var HStockInOrgID = sessionStorage["OrganizationID"] //璋冨叆缁勭粐ID
+ var HStockOutOrgID = sessionStorage["OrganizationID"] //璋冨嚭缁勭粐ID
+ var HStockOrgID = sessionStorage["OrganizationID"] //鐧诲叆缁勭粐ID
+ var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var listOption = [];
+ var columns = "";
+ var HModName = "Kf_MoveStockBill_AutoBarCode_PDA";
+ var ModRightName = "CE_MoveStock3"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillerID").val(sessionStorage["HBillerID"]);
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HBillType").val("1207");
+ $("#HRedBlueFlag").val("false");
+
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '1');
+ set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitStockOrgID(); //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鍏夋爣榛樿鍦ㄦ簮鍗曞崟鍙蜂綅缃笂
+ var pFocus = $("#HSourceBillNo");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+ //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ function set_InitStockOrgID() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HStockInOrgID").append(Organization);
+ $("#HStockInOrgID").val(HStockInOrgID)
+ $("#HStockOutOrgID").append(Organization);
+ $("#HStockOutOrgID").val(HStockOutOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 200
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+ if (HInterID != 0) {
+
+ }
+ else {
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ }
+ else {
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus(); //鑾峰彇鍏夋爣
+ }
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 鎻愪氦
+ form.on('submit(cmdSaver)', function (data) {
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = table.cache['wl-table'];
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var msg = sMainStr + ';' + JSON.stringify(sSubStr);
+
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/WEBSController/set_SaveMoveStockBill_AutoBarCode_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "oMain": msg },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+ btn2: function () {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }//鍏抽棴
+ }
+ , function () {
+ location.replace('Kf_MoveStockBill_AutoBarCode_PDA.html?OperationType=1&HInterID=0');
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ return;
+ }
+ });
+
+ //#endregion
+
+ //#region 閫�鍑�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ });
+ })
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '3720') {
+ HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ if ($("#HSourceBillListCtl").val() == '1') {
+ GetMeesageBySourceBillNo();
+ $("#HSourceBillListCtl").val("0"); //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+ }
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 鎵弿婧愬崟鏉＄爜
+
+ //鎵弿婧愬崟鏉＄爜
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
+ //婧愬崟鎸夐挳
+ form.on('submit(HSourceBillNo-BT)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var HSourceBillType = $("#HMainSourceBillType").val()
+
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_AutoBarCode_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HOWNERID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ $("#HSourceBillNo").val(result.data[0].HSourceBillNo);
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HStockStyle").val(result.data[0].HStockStyle);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data[0].HStockInOrgID);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data[0].HStockOutOrgID);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '2');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '1');
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: 'HQty', title: data[i].name, edit: 'text', align: 'left', totalRow: true });
+ }
+ else if (data[i].name == '婧愬崟鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data.Materlist;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冩嫧绫诲瀷
+ form.on('select(HStockStyle)', function (data) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�') {
+ $("#HStockInOrgID").attr("disabled", false);
+ form.render('select');
+ }
+ else {
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockInOrgID").attr("disabled", true);
+ form.render('select');
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ }
+ }
+ });
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冨叆缁勭粐
+ form.on('select(HStockInOrgID)', function (data) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ });
+
+ //#endregion
+
+
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(wl-table)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎵�杈撳叆鏁版嵁涓嶄负鏁板瓧锛岄粯璁や负0
+ obj.update({
+ HQty: 0
+ });
+ table.render(listOption);
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = isNaN(value) ? 0 : value; //鏁伴噺
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ });
+ table.render(listOption);
+ break;
+ default:
+ }
+ });
+ //#endregion
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ else {
+ var s = 0;
+ for (var i = 0; i <= sSubStr.length - 1; i++) {
+ // 灏濊瘯灏� HQty 灞炴�цВ鏋愪负鏁板瓧
+ let quantity = parseFloat(sSubStr[i].HQty) || 0;
+
+ // 妫�鏌ヨВ鏋愬悗鐨勫�兼槸鍚︿负 NaN锛堜笉鏄竴涓暟瀛楋級
+ if (isNaN(quantity)) {
+ // 濡傛灉鏄� NaN锛屽垯灏嗗叾璁剧疆涓� 0
+ sSubStr[i].HQty = 0;
+ } else if (sSubStr[i].HQty > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("鑷冲皯闇�瑕佸瓨鍦ㄤ竴琛屾暟閲忓ぇ浜�0 鐨勬暟鎹紝璇风‘璁ゆ棤璇悗鍐嶆彁浜わ紒", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ return true;
+ }
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index d220ffd..d47d2f2 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -231,6 +231,12 @@
<cite style="white-space:pre-wrap">鏍峰搧閿�鍞嚭搴撳崟</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_AutoBarCode_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">鍏嶆壂鐮佽皟鎷�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index a502f28..e29942a 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -233,16 +233,18 @@
<a>棰嗘枡鍙戣揣</a>
<dl class="layui-nav-child">
<!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曠淮鎶�</a></dd>
- <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd>
- <dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>
- <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
- <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>-->
+ <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd>
+ <dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
+ <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>-->
<dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曠淮鎶�</a></dd>
<!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>
- <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曠淮鎶�</a></dd>
- <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>-->
+ <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>-->
<dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">鐢熶骇棰嗘枡鍗�(闈炴煋鍘�)缁存姢</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_MateOutBillList.html?subType=缇婃瘺鏌撹壊">鐢熶骇棰嗘枡鍗�(缇婃瘺鏌撹壊)缁存姢</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_MateOutBillList.html?subType=姣涘皷">鐢熶骇棰嗘枡鍗�(姣涘皷)缁存姢</a></dd>
</dl>
</dd>
<dd>
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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index daa110a..c9d262a 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -7,7 +7,7 @@
<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">
+ 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">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -44,11 +44,17 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius"
- lay-submit="" lay-filter="Copy">澶嶅埗</button>
+ lay-submit="" lay-filter="Copy">
+ 澶嶅埗
+ </button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
- lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ lay-submit="" lay-filter="Saver">
+ 淇濆瓨
+ </button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
- lay-filter="Exit">閫�鍑�</button>
+ lay-filter="Exit">
+ 閫�鍑�
+ </button>
<!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>-->
</div>
@@ -72,7 +78,7 @@
<label class="layui-form-label">鐗╂枡浠ｇ爜*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber"
- id="HNumber" autocomplete="off">
+ id="HNumber" autocomplete="off">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
@@ -80,14 +86,14 @@
<label class="layui-form-label">鐗╂枡鍚嶇О*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName"
- autocomplete="off">
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HModel" id="HModel"
- autocomplete="off">
+ autocomplete="off">
</div>
</div>
@@ -95,7 +101,14 @@
<label class="layui-form-label">鍔╄鐮侊細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHelpCode" id="HHelpCode"
- autocomplete="off">
+ autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍦嗘満浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCircularKnittingMachineCode" id="HCircularKnittingMachineCode"
+ autocomplete="off">
</div>
</div>
</div>
@@ -105,16 +118,16 @@
<label class="layui-form-label">涓昏閲忓崟浣�*</label>
<div class="layui-input-inline">
<input type="text" readonly name="HUnitName" id="HUnitName"
- class="layui-input" value=""
- style="float: left; width: 100px;">
+ class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HUnitID" id="HUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HUnitList" id="HUnitList"
- style="width:40px;">
+ lay-filter="HUnitList" id="HUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -133,22 +146,22 @@
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HWeight" lay-verify="HWeight"
- id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
- value="0">
+ id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">榛樿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" readonly name="HWhName" id="HWhName"
- class="layui-input" value=""
- style="float: left; width: 100px;">
+ class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HWhID" id="HWhID" class="layui-input"
- value="0" style="float:left;width:150px;">
+ value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HWhList" id="HWhList" style="width:40px;">
+ lay-filter="HWhList" id="HWhList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -156,7 +169,7 @@
<label class="layui-form-label">鏌撹壊瑕佹眰</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HColorRemark"
- lay-verify="HColorRemark" id="HColorRemark" value="">
+ lay-verify="HColorRemark" id="HColorRemark" value="">
</div>
</div>
</div>
@@ -165,31 +178,31 @@
<label class="layui-form-label"> 棰滆壊锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HColor" lay-verify="HColor"
- id="HColor" autocomplete="off">
+ id="HColor" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">骞呭</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HWidth" lay-verify="HWidth"
- id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
- value="0">
+ id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HMaterClsName"
- id="HMaterClsName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HMaterClsName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HMaterTypeID" id="HMaterTypeID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="btnHMaterTypeID" id="btnHMaterTypeID"
- style="width:40px;">
+ lay-filter="btnHMaterTypeID" id="btnHMaterTypeID"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -200,7 +213,7 @@
<div class="layui-form">
<div class="layui-form-item">
<select name="HMaterClsID" id="HMaterClsID"
- lay-verify="HMaterClsID">
+ lay-verify="HMaterClsID">
<option value="1" selected>澶栬喘</option>
<option value="2">鑷埗</option>
<option value="3">濮斿</option>
@@ -215,15 +228,15 @@
<label class="layui-form-label">棣栦欢妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Fst"
- id="HQCSchemeName_Fst" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Fst" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst"
- value="0">
+ value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -231,15 +244,15 @@
<label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Proc"
- id="HQCSchemeName_Proc" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Proc" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Proc"
- id="HQCSchemeID_Proc" value="0">
+ id="HQCSchemeID_Proc" value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -247,15 +260,15 @@
<label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Patrol"
- id="HQCSchemeName_Patrol" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Patrol" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Patrol"
- id="HQCSchemeID_Patrol" value="0">
+ id="HQCSchemeID_Patrol" value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -265,7 +278,7 @@
<div class="layui-form">
<div class="layui-form-item">
<select name="HMaterRuleType" id="HMaterRuleType"
- lay-verify="HMaterRuleType">
+ lay-verify="HMaterRuleType">
<option value="鍏朵粬" selected>鍏朵粬</option>
<option value="鏌撴枡">鏌撴枡</option>
<option value="鍔╁墏">鍔╁墏</option>
@@ -276,15 +289,32 @@
</div>
</div>
<div class="layui-inline" style="display: inline-flex; flex-direction: row;">
- <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(鎵╁睍): </label>
+ <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(缇婃瘺): </label>
<div class="layui-input-inline">
<div class="layui-form">
<div class="layui-form-item">
<select name="HMaterRuleExternType" id="HMaterRuleExternType"
- lay-verify="HMaterRuleExternType">
+ lay-verify="HMaterRuleExternType">
<option value="鍏朵粬" selected>鍏朵粬</option>
- <option value="缇婃瘺">缇婃瘺</option>
- <option value="姣涘皷">姣涘皷</option>
+ <option value="鏌撴枡">鏌撴枡</option>
+ <option value="鍔╁墏">鍔╁墏</option>
+ <option value="鍔╁墏锛堟寜甯冪畻锛�">鍔╁墏锛堟寜甯冪畻锛�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="display: inline-flex; flex-direction: row;">
+ <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(姣涘皷): </label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HMaterRuleExternType1" id="HMaterRuleExternType1"
+ lay-verify="HMaterRuleExternType1">
+ <option value="鍏朵粬" selected>鍏朵粬</option>
+ <option value="鏌撴枡">鏌撴枡</option>
+ <option value="鍔╁墏">鍔╁墏</option>
+ <option value="鍔╁墏锛堟寜娴嗛噸绠楋級">鍔╁墏锛堟寜娴嗛噸绠楋級</option>
</select>
</div>
</div>
@@ -297,34 +327,34 @@
<label class="layui-form-label"> 棰滆壊鑹插彿锛�</label>
<div class="layui-input-inline" style="width: 151px;">
<input type="text" value="" placeholder="璇烽�夋嫨棰滆壊"
- class="layui-input" id="HColorNo" name="HColorNo"
- style="width: 101px; float: left;background-color: #efefef4d;"
- readonly>
+ class="layui-input" id="HColorNo" name="HColorNo"
+ style="width: 101px; float: left;background-color: #efefef4d;"
+ readonly>
<div id="HColorNoName" name="HColorNoName"
- style="width: 50px; "></div>
+ style="width: 50px; "></div>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓�娆″悎鏍�<br />鐜囨爣鍑嗗��</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOnceRightRate"
- id="HOnceRightRate" autocomplete="off"
- onfocus="this.select();" value="0" style="margin-top:10px;">
+ id="HOnceRightRate" autocomplete="off"
+ onfocus="this.select();" value="0" style="margin-top:10px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
<div class="layui-input-inline ">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea"
- name="HRemark" id="HRemark"></textarea>
+ name="HRemark" id="HRemark"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
<input type="checkbox" name="HStopflag" id="HStopflag"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁绂佺敤" disabled>
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
@@ -341,21 +371,21 @@
<label class="layui-form-label" style="width: 85px;">姣涢珮</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HHeight_M"
- id="HHeight_M">
+ id="HHeight_M">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀵告暟缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HInches_M"
- id="HInches_M">
+ id="HInches_M">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍏ㄦ瘺闀�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HAl1Long_M"
- id="HAl1Long_M">
+ id="HAl1Long_M">
</div>
</div>
</div>
@@ -364,21 +394,21 @@
<label class="layui-form-label" style="width: 85px;">鍧竷瀵嗗害</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDensity_M"
- id="HDensity_M">
+ id="HDensity_M">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">姣涚罕鍚嶇О鍙婅鏍�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HTela_M"
- id="HTela_M">
+ id="HTela_M">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">搴曚笣</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HUnderTela_M"
- id="HUnderTela_M">
+ id="HUnderTela_M">
</div>
</div>
</div>
@@ -387,7 +417,7 @@
<label class="layui-form-label" style="width: 85px;">瀹氬瀷娴嗘枡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HSizing_M"
- id="HSizing_M">
+ id="HSizing_M">
</div>
</div>
</div>
@@ -401,30 +431,30 @@
<label class="layui-form-label"> 榛樿浠撲綅缁勶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSPGroupID"
- lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off"
- value="0">
+ lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿浠撲綅锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSPID" lay-verify="HSPID"
- id="HSPID" autocomplete="off" value="0">
+ id="HSPID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿bom锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBomID" lay-verify="HBomID"
- id="HBomID" autocomplete="off" value="0">
+ id="HBomID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鎹㈢畻鐜囷細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate"
- lay-verify="HSecUnitRate" id="HSecUnitRate"
- autocomplete="off" value="0">
+ lay-verify="HSecUnitRate" id="HSecUnitRate"
+ autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>-->
@@ -437,8 +467,8 @@
<label class="layui-form-label"> 鏈�楂樺簱瀛橈細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHighStock"
- lay-verify="HHighStock" id="HHighStock" autocomplete="off"
- value="0">
+ lay-verify="HHighStock" id="HHighStock" autocomplete="off"
+ value="0">
</div>
</div>
@@ -446,24 +476,24 @@
<label class="layui-form-label"> 鏈�浣庡簱瀛橈細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLowStock"
- lay-verify="HLowStock" id="HLowStock" autocomplete="off"
- value="0">
+ lay-verify="HLowStock" id="HLowStock" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 瀹夊叏搴撳瓨锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSafeStock"
- lay-verify="HSafeStock" id="HSafeStock" autocomplete="off"
- value="0">
+ lay-verify="HSafeStock" id="HSafeStock" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 閲囪喘鍗曚环锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOrderPrice"
- lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off"
- value="0">
+ lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -472,8 +502,8 @@
<label class="layui-form-label"> 閿�鍞崟浠凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSalePrice"
- lay-verify="HSalePrice" id="HSalePrice" autocomplete="off"
- value="0">
+ lay-verify="HSalePrice" id="HSalePrice" autocomplete="off"
+ value="0">
</div>
</div>
@@ -481,31 +511,31 @@
<label class="layui-form-label"> 璁″垝鍗曚环锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPlanPrice"
- lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off"
- value="0">
+ lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏍囧噯鎴愭湰锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HstdPrice"
- lay-verify="HstdPrice" id="HstdPrice" autocomplete="off"
- value="0">
+ lay-verify="HstdPrice" id="HstdPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏈�澶ц璐ч噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HQtyMax" lay-verify="HQtyMax"
- id="HQtyMax" autocomplete="off" value="0">
+ id="HQtyMax" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍗曚欢鏈�澶т笂闄愶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPieceMaxQty"
- lay-verify="HPieceMaxQty" id="HPieceMaxQty"
- autocomplete="off" value="0">
+ lay-verify="HPieceMaxQty" id="HPieceMaxQty"
+ autocomplete="off" value="0">
</div>
</div>
</div>
@@ -514,38 +544,38 @@
<label class="layui-form-label"> 鐗堟湰鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HVersion" lay-verify="HVersion"
- id="HVersion" autocomplete="off">
+ id="HVersion" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 杈呭姪灞炴�э細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPropertyTypeID"
- lay-verify="HPropertyTypeID" id="HPropertyTypeID"
- autocomplete="off" value="0">
+ lay-verify="HPropertyTypeID" id="HPropertyTypeID"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏁伴噺绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HQtyDec" lay-verify="HQtyDec"
- id="HQtyDec" autocomplete="off" value="0">
+ id="HQtyDec" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍗曚环绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPriceDec"
- lay-verify="HPriceDec" id="HPriceDec" autocomplete="off"
- value="0">
+ lay-verify="HPriceDec" id="HPriceDec" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 閲戦绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMoneyDec"
- lay-verify="HMoneyDec" id="HMoneyDec" autocomplete="off"
- value="0">
+ lay-verify="HMoneyDec" id="HMoneyDec" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -558,16 +588,16 @@
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HUnitGroupName"
- id="HUnitGroupName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HUnitGroupName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HUnitGroupID" id="HUnitGroupID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HUnitGroupList" id="HUnitGroupList"
- style="width:40px;">
+ lay-filter="HUnitGroupList" id="HUnitGroupList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -578,7 +608,7 @@
<label class="layui-form-label"> 闄勫姞灞炴��1锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSubjoin" lay-verify="HSubjoin"
- id="HSubjoin" autocomplete="off">
+ id="HSubjoin" autocomplete="off">
</div>
</div>
@@ -586,23 +616,23 @@
<label class="layui-form-label">鏉ユ枡妫�楠岋細</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCHECKINCOMING" id="HCHECKINCOMING"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁鏉ユ枡妫�楠�">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁鏉ユ枡妫�楠�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浜у搧妫�楠岋細</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCHECKPRODUCT" id="HCHECKPRODUCT"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁浜у搧妫�楠�">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁浜у搧妫�楠�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 闄勫姞灞炴��2锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2"
- id="HSubjoin2" autocomplete="off">
+ id="HSubjoin2" autocomplete="off">
</div>
</div>
@@ -610,21 +640,21 @@
<label class="layui-form-label"> 鑻辨枃鍚嶇О锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEngName" lay-verify="HEngName"
- id="HEngName" autocomplete="off">
+ id="HEngName" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿宸ヨ壓璺嚎锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRoutingID" lay-verify="HRoutingID"
- id="HRoutingID" autocomplete="off" value="0">
+ id="HRoutingID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEngModel" lay-verify="HEngModel"
- id="HEngModel" autocomplete="off">
+ id="HEngModel" autocomplete="off">
</div>
</div>
@@ -632,15 +662,15 @@
<label class="layui-form-label">椤圭洰</label>
<div class="layui-input-inline">
<input type="text" readonly name="HProjectName" id="HProjectName"
- class="layui-input" value="" style="float: left; width: 100px;">
+ class="layui-input" value="" style="float: left; width: 100px;">
<input type="hidden" name="HProjectBillMainID"
- id="HProjectBillMainID" class="layui-input" value="0"
- style="float:left;width:150px;">
+ id="HProjectBillMainID" class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HProjectGroupList" id="HProjectGroupList"
- style="width:40px;">
+ lay-filter="HProjectGroupList" id="HProjectGroupList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -649,7 +679,7 @@
<div class="layui-input-inline">
<div class="layui-form-item">
<select name="HDivisionID" id="HDivisionID"
- lay-verify="HDivisionID">
+ lay-verify="HDivisionID">
<option value="0" selected>璇烽�夋嫨</option>
<option value="3" selected>娉ㄥ浜嬩笟閮�</option>
<option value="4">杞浜嬩笟閮�</option>
@@ -661,23 +691,23 @@
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSecUnitName"
- id="HSecUnitName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSecUnitName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSecUnitID" id="HSecUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSecUnitList" id="HSecUnitList"
- style="width:40px;">
+ lay-filter="HSecUnitList" id="HSecUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -686,8 +716,8 @@
<label class="layui-form-label"> 淇濊川鏈燂細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HKeepDays"
- lay-verify="HKeepDays" id="HKeepDays" autocomplete="off"
- value="0">
+ lay-verify="HKeepDays" id="HKeepDays" autocomplete="off"
+ value="0">
</div>
</div>
@@ -695,24 +725,24 @@
<label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMinPickQty"
- lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off"
- value="0">
+ lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLotcardQty"
- lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off"
- value="0">
+ lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 宸ヤ綅鏁伴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCubicleQty"
- lay-verify="HCubicleQty" id="HCubicleQty" autocomplete="off"
- value="0">
+ lay-verify="HCubicleQty" id="HCubicleQty" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -726,16 +756,16 @@
<label class="layui-form-label">閿�鍞閲忓崟浣�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSALEUNITName"
- id="HSALEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSALEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSALEUNITID" id="HSALEUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSALEUNITList" id="HSALEUNITList"
- style="width:40px;">
+ lay-filter="HSALEUNITList" id="HSALEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -745,16 +775,16 @@
<label class="layui-form-label">閿�鍞浠�<br />璁￠噺鍗曚綅</label>
<div class="layui-input-inline" style="margin-top:10px">
<input type="text" readonly name="HSALEPRICEUNITName"
- id="HSALEPRICEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSALEPRICEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSALEPRICEUNITID"
- id="HSALEPRICEUNITID" class="layui-input" value="0"
- style="float:left;width:150px;">
+ id="HSALEPRICEUNITID" class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList"
- style="width:40px;">
+ lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -764,16 +794,16 @@
<label class="layui-form-label">鍩烘湰璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HBASEUNITName"
- id="HBASEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HBASEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HBASEUNITID" id="HBASEUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HBASEUNITList" id="HBASEUNITList"
- style="width:40px;">
+ lay-filter="HBASEUNITList" id="HBASEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -783,16 +813,16 @@
<label class="layui-form-label">搴撳瓨璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSTOREUNITName"
- id="HSTOREUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSTOREUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSTOREUNITList" id="HSTOREUNITList"
- style="width:40px;">
+ lay-filter="HSTOREUNITList" id="HSTOREUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -802,16 +832,16 @@
<label class="layui-form-label">閲囪喘璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HPOUnitName"
- id="HPOUnitName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HPOUnitName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HPOUnitID" id="HPOUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HPOUnitList" id="HPOUnitList"
- style="width:40px;">
+ lay-filter="HPOUnitList" id="HPOUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -822,16 +852,16 @@
<label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPERUNITSTANDHOUR"
- lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR"
- autocomplete="off" value="0">
+ lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDLABORPREPARETIME"
- lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME"
- autocomplete="off" value="0">
+ lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME"
+ autocomplete="off" value="0">
</div>
</div>
@@ -839,24 +869,24 @@
<label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDMACHINEPREPARETIME"
- lay-verify="HSTDMACHINEPREPARETIME"
- id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
+ lay-verify="HSTDMACHINEPREPARETIME"
+ id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">甯哥敤鏉愭枡锛�</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁甯哥敤鏉愭枡">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁甯哥敤鏉愭枡">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍔犳潈骞冲潎浠凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HAvgStockPrice"
- lay-verify="HAvgStockPrice" id="HAvgStockPrice"
- autocomplete="off" value="0">
+ lay-verify="HAvgStockPrice" id="HAvgStockPrice"
+ autocomplete="off" value="0">
</div>
</div>
</div>
@@ -865,38 +895,38 @@
<label class="layui-form-label">榛樿绋庣巼</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HTaxRate" lay-verify="HTaxRate"
- id="HTaxRate" autocomplete="off" value="13">
+ id="HTaxRate" autocomplete="off" value="13">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">榛樿鍒╂鼎鐜�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HProfitRate"
- lay-verify="HProfitRate" id="HProfitRate" autocomplete="off"
- value="0">
+ lay-verify="HProfitRate" id="HProfitRate" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 缁撶畻浠�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HFootPrice"
- lay-verify="HFootPrice" id="HFootPrice" autocomplete="off"
- value="0">
+ lay-verify="HFootPrice" id="HFootPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍚◣鎴愭湰浠�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HTaxCost" lay-verify="HTaxCost"
- id="HTaxCost" autocomplete="off" value="0">
+ id="HTaxCost" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 涓嶅惈绋庢垚鏈环</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HNoTaxCost"
- lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off"
- value="0">
+ lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -910,7 +940,7 @@
<label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMakeEmp"
- id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ id="HMakeEmp" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -918,14 +948,14 @@
<label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCheckEmp"
- id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ id="HCheckEmp" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HStopEmp"
- id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ id="HStopEmp" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -934,7 +964,7 @@
<label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMakeDate"
- id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -942,15 +972,15 @@
<label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCheckDate"
- id="HCheckDate" style="background-color:#efefef4d;"
- readonly>
+ id="HCheckDate" style="background-color:#efefef4d;"
+ readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HStopDate"
- id="HStopDate" style="background-color:#efefef4d;" readonly>
+ id="HStopDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -962,8 +992,10 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
<button type="button" class="layui-btn"
- id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file"
- type="file" accept="" name="file" multiple="">
+ id="testList">
+ 閫夋嫨鏂囦欢
+ </button><input class="layui-upload-file"
+ type="file" accept="" name="file" multiple="">
<div class="layui-upload-list">
<table class="layui-table" lay-filter="mainTable">
<thead>
@@ -1368,7 +1400,8 @@
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
, "HMaterRuleType": data.鐗╂枡鍏紡
- , "HMaterRuleExternType": data.鎵╁睍鐗╂枡鍏紡
+ , "HMaterRuleExternType": data.缇婃瘺鐗╂枡鍏紡
+ , "HMaterRuleExternType1": data.姣涘皷鐗╂枡鍏紡
, "HColorNo": data.棰滆壊鑹插彿
, "HCommonUseFlag": data.鏄惁涓嶅父鐢ㄦ潗鏂�
, "HAvgStockPrice": data.鍔犳潈骞冲潎浠�
@@ -1389,8 +1422,8 @@
, "HTela_M": data.姣涚罕鍚嶇О鍙婅鏍�
, "HUnderTela_M": data.搴曚笣
, "HSizing_M": data.瀹氬瀷娴嗘枡
- , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
- , "HCubicleQty": data.宸ヤ綅鏁伴噺
+ , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲� || 0
+ , "HCubicleQty": data.宸ヤ綅鏁伴噺 || 0
, "HMakeEmp": data["鍒涘缓浜�"]
, "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
, "HCheckEmp": data["瀹℃牳浜�"]
@@ -1646,29 +1679,29 @@
}
}
- var HMinPickQty = $('#HMinPickQty').val();
- if (HMinPickQty.substring(HMinPickQty.length - 1, HMinPickQty.length) == ".") {
- layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
- return;
- } else {
- var ref = /^[0-9]+\.?[0-9]*$/;
- if (!ref.test(HMinPickQty)) {
- layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
- return;
- }
- }
+ //var HMinPickQty = $('#HMinPickQty').val();
+ //if (HMinPickQty.substring(HMinPickQty.length - 1, HMinPickQty.length) == ".") {
+ // layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HMinPickQty)) {
+ // layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
- var HLotcardQty = $('#HLotcardQty').val();
- if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
- layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
- return;
- } else {
- var ref = /^[0-9]+\.?[0-9]*$/;
- if (!ref.test(HLotcardQty)) {
- layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
- return;
- }
- }
+ //var HLotcardQty = $('#HLotcardQty').val();
+ //if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
+ // layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HLotcardQty)) {
+ // layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
var HPERUNITSTANDHOUR = $('#HPERUNITSTANDHOUR').val();
if (HPERUNITSTANDHOUR.substring(HPERUNITSTANDHOUR.length - 1, HPERUNITSTANDHOUR.length) == ".") {
@@ -1795,7 +1828,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1827,7 +1860,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1859,7 +1892,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1893,7 +1926,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1929,7 +1962,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html?HType=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1959,7 +1992,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2053,7 +2086,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?HType=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2081,7 +2114,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2116,7 +2149,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2151,7 +2184,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2186,7 +2219,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2221,7 +2254,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 4c1a350..4ef0007 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1639,7 +1639,13 @@
</div> `,
success: function (layero, index) {
$("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
- $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞★紙閬垮厤淇敼鍘熸棩鏈燂級
+ const after30Days = new Date(currentDate);
+ // 璁剧疆鏃ユ湡涓哄綋鍓嶆棩鏈� + 30澶�
+ after30Days.setDate(currentDate.getDate() + 30);
+ $("#endTime").val(Format(after30Days, "yyyy-MM-dd"));
// 纭畾鎸夐挳鐐瑰嚮浜嬩欢
$('#confirmTime').on('click', function () {
var startTime = $('#startTime').val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html"
new file mode 100644
index 0000000..c3f9373
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillSync.html"
@@ -0,0 +1,562 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑虹珯鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚屾鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+ <option value="1" >鍏ㄩ儴</option>
+ <option value="2">宸插悓姝�</option>
+ <option value="3">鏈悓姝�</option>
+ <option value="4" selected="selected">鍚屾澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <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>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ var HModName = "Cj_StationEntrustInBillSync"
+ var syncMessage = []//鍚屾鎶ラ敊淇℃伅
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[
+
+ ]]
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ set_ClearQuery();
+ get_FastQuery();
+ }
+
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍚屾
+ case 'btn-InSync': get_InSync();
+ break;
+ //鎵归噺鍚屾
+ case 'btn_InSync_Batch': get_InSync_Batch();
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-Exit': get_Exit();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HWorkBillNo").val("");
+ $("#HBillNo").val("");
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HProcExchBillNo").val("");
+ $("#HRelationQty").val("4");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render("select");
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HRelationQty = $("#HRelationQty").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ switch (HRelationQty) {
+ case "1":
+ sWhere += "";
+ break;
+ case "2":
+ sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+ break;
+ case "3":
+ sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ case "4":
+ sWhere += " and 鍚屾鐘舵�� = '鍚屾澶辫触'";
+ break;
+ }
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) > '" + HDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 0) {
+ option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
+ } else {
+ var data = [];
+ var col = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+ }
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+ }
+ table.render(option);
+ layer.close(wait);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鎵归噺鍚屾
+ function get_InSync_Batch() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+ var InterID = '';
+ var BillNo = '';
+ syncMessage = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID=(data[i].hmainid.toString());
+ BillNo=(data[i].鍗曟嵁鍙�.toString());
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ let errMessage = [];
+ errMessage.push(data1.Message);
+ syncMessage.push(errMessage);
+ layer.alert(data1.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ }
+ else {
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
+ }
+ }
+ //鍚屾
+ function get_InSync() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹悓姝ワ紒');
+ }
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option.data;
+
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile('mainTable', data, "xls");
+
+ }
+ //#endregion
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //閫�鍑�
+ function get_Exit() {
+ Pub_Close(2);
+ }
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+ function getDeptIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HItemID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and HDeptID in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html"
new file mode 100644
index 0000000..7dd2354
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillSync.html"
@@ -0,0 +1,564 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑虹珯鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚屾鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+ <option value="1" >鍏ㄩ儴</option>
+ <option value="2">宸插悓姝�</option>
+ <option value="3">鏈悓姝�</option>
+ <option value="4" selected="selected">鍚屾澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <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>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ var HModName = "Cj_StationEntrustOutBillSync"
+ var syncMessage = []//鍚屾鎶ラ敊淇℃伅
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[
+
+ ]]
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ set_ClearQuery();
+ get_FastQuery();
+ }
+
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍚屾
+ case 'btn-InSync': get_InSync();
+ break;
+ //鎵归噺鍚屾
+ case 'btn_InSync_Batch': get_InSync_Batch();
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-Exit': get_Exit();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HWorkBillNo").val("");
+ $("#HBillNo").val("");
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HProcExchBillNo").val("");
+ $("#HRelationQty").val("4");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render("select");
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HRelationQty = $("#HRelationQty").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ switch (HRelationQty) {
+ case "1":
+ sWhere += "";
+ break;
+ case "2":
+ sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+ break;
+ case "3":
+ sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ case "4":
+ sWhere += " and 鍚屾鐘舵�� = '鍚屾澶辫触'";
+ break;
+ }
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) > '" + HDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 0) {
+ option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
+ } else {
+ var data = [];
+ var col = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+ }
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+ }
+ table.render(option);
+ layer.close(wait);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鎵归噺鍚屾
+ function get_InSync_Batch() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+ var InterID = '';
+ var BillNo = '';
+ syncMessage = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID=(data[i].hmainid.toString());
+ BillNo=(data[i].鍗曟嵁鍙�.toString());
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ let errMessage = [];
+ errMessage.push(data1.Message);
+ syncMessage.push(errMessage);
+ layer.alert(data1.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ }
+ else {
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
+ }
+ }
+ //鍚屾
+ function get_InSync() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹悓姝ワ紒');
+ }
+ }
+
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option.data;
+
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile('mainTable', data, "xls");
+
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //閫�鍑�
+ function get_Exit() {
+ Pub_Close(2);
+ }
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+ function getDeptIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HItemID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and HDeptID in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
index cc979cb..7b36426 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
@@ -107,7 +107,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
- <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭閿欒淇℃伅</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
@@ -247,7 +247,7 @@
break;
//瀵煎嚭excel
case 'get_export':
- table.exportFile(['閿欒淇℃伅'], syncMessage, 'xls');
+ get_Export();
break;
//閫�鍑�
case 'btn-Exit': get_Exit();
@@ -466,8 +466,41 @@
}
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
+ var data = option.data;
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile('mainTable', data, "xls");
+ } else {
+ layer.alert(get_MessageError("[褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺]褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
- table.on('row(mainTablemainTable)', function (obj) {
+ table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 86d5f62..941af09 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
@@ -493,6 +494,13 @@
})
//#endregion
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 5294b68..9ff4903 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
@@ -543,6 +544,12 @@
Pub_Close(1);
})
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 7b86cdc..66c441a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
@@ -533,6 +534,13 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index e326df7..4614569 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
@@ -501,6 +502,13 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index f7b4108..6332dd4 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
@@ -477,6 +478,14 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 琛ㄥご鎿嶄綔鎸夐挳
+
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 4815da7..833a013 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -56,6 +56,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">鍙嶅鏍�</button>
@@ -723,6 +724,13 @@
});
//#endregion
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
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.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.html"
index 16dc342..ce73a42 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.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.html"
@@ -44,6 +44,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="btn-print" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
@@ -665,6 +666,16 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 琛ㄥご鎿嶄綔鎸夐挳
+
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ url.searchParams.set('OperationType', '1'); // 淇敼鎴栨坊鍔犲弬鏁�
+ url.searchParams.set('linterid', '0'); // 淇敼鎴栨坊鍔犲弬鏁�
+ location.href = url.toString();
+ });
+ //#endregion
+
//#region 閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
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 ee9ea36..8ae43d4 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"
@@ -71,7 +71,7 @@
id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
- <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden"
+ <input id="HBillSubType" name="HBillSubType" type="hidden"
value="姣涘皷" />
</div>
</div>
@@ -472,7 +472,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType": "", "HMaterRuleExternType": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType": "", "HMaterRuleExternType1": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
console.log(NewRow);
switch (obj.event) {
//搴撳瓨鏌ヨ
@@ -901,17 +901,17 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
- var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- // if (HMaterRuleType == "鏌撴枡") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- // } else if (HMaterRuleType == "鍔╁墏") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- // } else if (HMaterRuleExternType == '姣涘皷') {
- if (HMaterRuleExternType == '姣涘皷') {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ var HMaterRuleExternType1 = option.data[i].HMaterRuleExternType1;
+ if (HMaterRuleExternType1 == "鏌撴枡") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ } else if (HMaterRuleExternType1 == "鍔╁墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ }
+ //if (HMaterRuleExternType == '姣涘皷') {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ //}
}
table.render(option);
});
@@ -926,17 +926,17 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
- var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- //if (HMaterRuleType == "鏌撴枡") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- //} else if (HMaterRuleType == "鍔╁墏") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- //} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- //} else if (HMaterRuleExternType == '姣涘皷') {
- if (HMaterRuleExternType == '姣涘皷') {
+ var HMaterRuleExternType1 = option.data[i].HMaterRuleExternType1;
+ if (HMaterRuleExternType1 == "鏌撴枡") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ } else if (HMaterRuleExternType1 == "鍔╁墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleType == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ }
+ //if (HMaterRuleExternType == '姣涘皷') {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ //}
}
table.render(option);
});
@@ -1137,18 +1137,18 @@
var HRate = value;
var HQty = 0;
var HMaterRuleType = obj.data.HMaterRuleType;
- var HMaterRuleExternType = obj.data.HMaterRuleExternType;
+ var HMaterRuleExternType1 = obj.data.HMaterRuleExternType1;
- // if (HMaterRuleType == "鏌撴枡") {
- // HQty = dealDoubleToFixed(HRate * HWeight);
- // } else if (HMaterRuleType == "鍔╁墏") {
- // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
- // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- // } else if (HMaterRuleExternType == '姣涘皷') {
- if (HMaterRuleExternType == '姣涘皷') {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- }
+ if (HMaterRuleExternType1 == "鏌撴枡") {
+ HQty = dealDoubleToFixed(HRate * HWeight);
+ } else if (HMaterRuleExternType1 == "鍔╁墏") {
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ }
+ //if (HMaterRuleExternType == '姣涘皷') {
+ // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ //}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HRate: value,
@@ -1166,7 +1166,7 @@
HQty = dealDoubleToFixed(HRate * HWeight);
} else if (HMaterRuleType == "鍔╁墏") {
HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ } else if (HMaterRuleType == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1338,7 +1338,7 @@
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
//, { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100, type: 'hidden' }
- , { field: 'HMaterRuleExternType', title: '鐗╂枡鍏紡', width: 100 }
+ , { field: 'HMaterRuleExternType1', title: '鐗╂枡鍏紡', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
@@ -1703,7 +1703,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1729,7 +1729,7 @@
option.data[rowIndex + i].HMaterCode = resultData.HMaterNumber;
option.data[rowIndex + i].HMaterName = resultData.HMaterName;
option.data[rowIndex + i].HMaterRuleType = resultData.HMaterRuleType;
- option.data[rowIndex + i].HMaterRuleExternType = resultData.HMaterRuleExternType;
+ option.data[rowIndex + i].HMaterRuleExternType1 = resultData.HMaterRuleExternType1;
option.data[rowIndex + i].HMaterSpec = resultData.HMaterModel;
option.data[rowIndex + i].HUnitID = resultData.HUnitID;
option.data[rowIndex + i].HUnitCode = resultData.HUnitNumber;
@@ -1743,16 +1743,16 @@
//鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
- // if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
- // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
- // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- // } else if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
- if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- }
+ if (option.data[rowIndex + i].HMaterRuleExternType1 == "鏌撴枡") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ } else if (option.data[rowIndex + i].HMaterRuleExternType1 == "鍔╁墏") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ } else if (option.data[rowIndex + i].HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ }
+ //if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ //}
}
table.render(option);
layer.closeAll();
@@ -1776,7 +1776,7 @@
var resultData = getMaterialByMaterID(OptionData[0].HItemID);
obj.update({
HMaterRuleType: resultData.HMaterRuleType,
- HMaterRuleExternType: resultData.HMaterRuleExternType,
+ HMaterRuleExternType1: resultData.HMaterRuleExternType1,
HMaterID: resultData.HMaterID,
HMaterCode: resultData.HMaterNumber,
HMaterName: resultData.HMaterName,
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 d1cae05..a48518b 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"
@@ -71,7 +71,7 @@
id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
- <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden" value="缇婃瘺鏌撹壊"/>
+ <input id="HBillSubType" name="HBillSubType" type="hidden" value="缇婃瘺鏌撹壊"/>
</div>
</div>
<div class="layui-inline">
@@ -993,16 +993,16 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- // if (HMaterRuleType == "鏌撴枡") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- // } else if (HMaterRuleType == "鍔╁墏") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- // } else if (HMaterRuleExternType == '缇婃瘺') {
- if (HMaterRuleExternType == '缇婃瘺') {
+ if (HMaterRuleExternType == "鏌撴枡") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ } else if (HMaterRuleExternType == "鍔╁墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ }
+ //if (HMaterRuleExternType == '缇婃瘺') {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ // }
}
table.render(option);
});
@@ -1018,16 +1018,16 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- // if (HMaterRuleType == "鏌撴枡") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- // } else if (HMaterRuleType == "鍔╁墏") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- // } else if (HMaterRuleExternType == '缇婃瘺') {
- if (HMaterRuleExternType == '缇婃瘺') {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ if (HMaterRuleExternType == "鏌撴枡") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ } else if (HMaterRuleExternType == "鍔╁墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ }
+ //if (HMaterRuleExternType == '缇婃瘺') {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ //}
}
table.render(option);
});
@@ -1229,16 +1229,16 @@
var HQty = 0;
var HMaterRuleType = obj.data.HMaterRuleType;
var HMaterRuleExternType = obj.data.HMaterRuleExternType;
- // if (HMaterRuleType == "鏌撴枡") {
- // HQty = dealDoubleToFixed(HRate * HWeight);
- // } else if (HMaterRuleType == "鍔╁墏") {
- // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
- // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- // } else if (HMaterRuleExternType == '缇婃瘺') {
- if (HMaterRuleExternType == '缇婃瘺') {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- }
+ if (HMaterRuleExternType == "鏌撴枡") {
+ HQty = dealDoubleToFixed(HRate * HWeight);
+ } else if (HMaterRuleExternType == "鍔╁墏") {
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ }
+ //if (HMaterRuleExternType == '缇婃瘺') {
+ // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ //}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HRate: value,
@@ -1794,7 +1794,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1834,16 +1834,16 @@
//鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
- // if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
- // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
- // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- // } else if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
- if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- }
+ if (option.data[rowIndex + i].HMaterRuleExternType == "鏌撴枡") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ } else if (option.data[rowIndex + i].HMaterRuleExternType == "鍔╁墏") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ } else if (option.data[rowIndex + i].HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ }
+ //if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ //}
}
table.render(option);
layer.closeAll();
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_MateOutBillLEdit.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_MateOutBillLEdit.html"
index 86a0f7d..8c3be7a 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_MateOutBillLEdit.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_MateOutBillLEdit.html"
@@ -59,6 +59,7 @@
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ <input id="HBillSubType" name="HBillSubType" type="hidden" />
</div>
</div>
<div class="layui-inline">
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 10e68f5..7f4d3b3 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"
@@ -280,8 +280,8 @@
return vars;
}
var params = getUrlVars();
- var subType = decodeURIComponent(params['subType']) // 鍖哄垎鍗曟嵁绫诲瀷
- console.log("subType: ", subType)
+ var subType = decodeURIComponent(params['subType'] || '') // 鍖哄垎鍗曟嵁绫诲瀷
+ console.log("subType: ", subType || '')
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -846,8 +846,10 @@
if (HEndDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
- if(subType) {
- sWhere += " and HMainSourceBillType = N'" + subType + "'"; // 鏍规嵁閫掑叆鍗曟嵁绫诲瀷鐨勪笉鍚岀瓫閫変笉鍚岀殑鍗曟嵁
+ if (subType) {
+ sWhere += " and HBillSubType = N'" + subType + "'"; // 鏍规嵁閫掑叆鍗曟嵁绫诲瀷鐨勪笉鍚岀瓫閫変笉鍚岀殑鍗曟嵁
+ } else {
+ sWhere += " and HBillSubType = N'1204'"
}
$.ajax({
url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList',
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/Add_Edit_Kf_POStockInBillList.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/Add_Edit_Kf_POStockInBillList.html"
index 4b6edd9..7a7c853 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/Add_Edit_Kf_POStockInBillList.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/Add_Edit_Kf_POStockInBillList.html"
@@ -49,6 +49,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>-->
@@ -531,6 +532,15 @@
Pub_Close(1);
})
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ url.searchParams.set('OperationType', '1'); // 淇敼鎴栨坊鍔犲弬鏁�
+ url.searchParams.set('linterid', '0'); // 淇敼鎴栨坊鍔犲弬鏁�
+ location.href = url.toString();
+ });
+ //#endregion
+
//#region 鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
--
Gitblit v1.9.1