From fd15749f66359c320b4c9662d803c80c4b16747b Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 09 十一月 2021 16:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/grf/器具报废入库单.grf | 3
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html | 2
WebTM/views/基础资料/公用基础资料/Pay_PeriodInfoSet.html | 304 +++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldRepairInStockBill.aspx | 4
WebTM/views/基础资料/公用基础资料/grf/器具改制出库单.grf | 4
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldScrapOutStockBill.aspx | 2
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 2
WebTM/views/基础资料/公用基础资料/grf/器具处理出库单.grf | 10
WebTM/views/PublicPage/SupplierInformation.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 38
WebTM/views/index.html | 1
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrjSub.html | 307 +++++++++++
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrjSub.html | 319 +++++++++++
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 49 +
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldRepairOutStockBill.aspx | 4
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 5
WebTM/views/基础资料/公用基础资料/grf/器具改制入库单.grf | 8
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldOtherOutStockBill.aspx | 4
WebTM/views/基础资料/公用基础资料/grf/器具其他出库单.grf | 2
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldScrapInStockBill.aspx | 4
WebTM/views/基础资料/公用基础资料/Add_Edit_Pay_PeriodInfoSet.html | 279 ++++++++++
WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html | 10
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBillList.html | 171 ------
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldOtherInStockBill.aspx | 4
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 2
WebTM/WebTM.csproj | 18
WebTM/views/基础资料/公用基础资料/grf/器具其他入库单.grf | 8
33 files changed, 1,336 insertions(+), 244 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f83f9fb..455a84b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -118,8 +118,12 @@
<Content Include="views\PublicPage\PowerInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrjSub.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrjSub.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Pay_PeriodInfoSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderBackInfo.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
@@ -140,19 +144,19 @@
<Content Include="views\grf\鍣ㄥ叿棰嗙敤閫�搴撳崟.grf" />
<Content Include="views\grf\鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鐩存帴璋冩嫧鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 916ca49..802a542 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,7 +5,7 @@
var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index 86fbf7a..57d124d 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -88,7 +88,7 @@
, util = layui.util
, tree = layui.tree
var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
- var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = 1 "; //鍒楄〃
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
//tree.render({
// elem: '#treeSupplier',
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9c013e9..53e45ab 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -739,6 +739,7 @@
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">鏍哥畻鏂瑰紡</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrjSub.html">鏍哥畻璁板綍</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">鏈堝害璁剧疆</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></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_ClassTimePrjSub.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_ClassTimePrjSub.html"
new file mode 100644
index 0000000..34528fa
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrjSub.html"
@@ -0,0 +1,319 @@
+锘�<!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.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/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-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" 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="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎵�灞炵粍</label>
+ <div class="layui-input-inline">
+ <input type="text" name="hparentName" id="hparentName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="hparentid" id="hparentid" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="hparent-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浼氳骞翠唤</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HYear" lay-verify="HYear" id="HYear">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浼氳鏈堜唤</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPeriod" lay-verify="HPeriod" id="HPeriod">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎬婚噾棰�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎬诲熀鏁�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">骞冲潎宸ヨ祫</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ュ钩鍧囧伐璧�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇骞冲潎宸ヨ祫</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRate" lay-verify="HRate" id="HRate" >
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ <!--<input type="hidden" value="0" name="HParentID" id="HParentID">-->
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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
+ , element = layui.element;
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HItemID").val(0);
+ }
+ else if (OperationType == 3) {//缂栬緫
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) {//娴忚
+ $("#HItemID").val(linterid);//
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //閫夋嫨鎵�灞炵粍鎸夐挳
+ form.on('submit(hparent-BT)', function () {
+ get_checkparent();
+ });
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Gy_ClassTimePrjSub/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ //var IsHStopflag = data.HStopflag;
+ //绂佺敤鏍囪
+ //if (IsHStopflag) {
+ // $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ //}
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HName": data.HName
+ , "HNumber": data.鏈堝害鏍哥畻璁板綍浠ｇ爜
+ , "HYear": data.浼氳骞翠唤
+ , "HPeriod": data.浼氳鏈堜唤
+ , "hparentName": data.缁勫悕绉�
+ , "hparentid": data.缁勪唬鐮�
+ , "HSumMoney": data.鎬婚噾棰�
+ , "HSumWorkTimes": data.鎬诲熀鏁�
+ , "HOldRate": data.骞冲潎宸ヨ祫
+ , "HDayRate": data.鏃ュ钩鍧囧伐璧�
+ , "HRate": data.淇骞冲潎宸ヨ祫
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ //var sMainStr = JSON.stringify(data.field);
+
+ var sMainStr = JSON.stringify(data.field);
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Gy_ClassTimePrjSub/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ //console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+
+
+ //#region 閫夋嫨鎵�灞炵粍鏂规硶
+ function get_checkparent() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鎵�灞炵粍鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#hparentName").val(checkStatus.data[0].HName);
+ $("#hparentid").val(checkStatus.data[0].HItemID);
+ //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Add_Edit_Gy_ClassTimePrjSub.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Pay_PeriodInfoSet.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_Pay_PeriodInfoSet.html"
new file mode 100644
index 0000000..f43a620
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Pay_PeriodInfoSet.html"
@@ -0,0 +1,279 @@
+锘�<!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.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/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-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" 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="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">骞翠唤</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HYear" lay-verify="HYear" id="HYear" autocomplete="off">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏈堜唤</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPeriod" id="HPeriod" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍩烘湰澶╂暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" >
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔犵彮澶╂暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HOverWorkTimes" lay-verify="HOverWorkTimes" id="HOverWorkTimes">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍩烘湰宸ヨ祫</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBasePay" lay-verify="HBasePay" id="HBasePay">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <input type="hidden" value="true" name="HUseFlag" id="HUseFlag">
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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
+ , element = layui.element;
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HItemID").val(0);
+ }
+ else if (OperationType == 3) {//缂栬緫
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) {//娴忚
+ $("#HItemID").val(linterid);//
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+ ////鏄惁绂佺敤鎸夐挳
+ form.on('checkbox(checkboxHStopflag)', function (data) {
+ $("#HStopflag").val(data.elem.checked);
+ });
+
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Pay_PeriodInfoSet/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ var IsHStopflag = data.绂佺敤鏍囪;
+ //绂佺敤鏍囪
+ if (IsHStopflag) {
+ $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ }
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HYear": data.骞�
+ , "HPeriod": data.鏈�
+ , "HWorkTimes": data.鍩烘湰澶╂暟
+ , "HOverWorkTimes": data.鍔犵彮澶╂暟
+ , "HBasePay": data.鍩烘湰宸ヨ祫
+ , "HStopflag": data.绂佺敤鏍囪
+ , "HRemark": data.澶囨敞
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+ var sMainStr = JSON.stringify(data.field);
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Pay_PeriodInfoSet/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Add_Edit_Pay_PeriodInfoSet.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
index 1492fed..e4c3ce6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
@@ -81,7 +81,7 @@
, util = layui.util
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.html"
new file mode 100644
index 0000000..96b73a2
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.html"
@@ -0,0 +1,307 @@
+锘�<!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">
+ <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/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>
+
+</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-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="HNumber" id="HNumber">
+ </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>
+ </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ 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
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'HParentID', title: 'HParentID', sort: true, hide: true }
+ , { field: '鏈堝害鏍哥畻璁板綍浠ｇ爜', title: '鏈堝害鏍哥畻璁板綍浠ｇ爜', width: 150 }
+ , { field: '浼氳骞翠唤', title: '浼氳骞翠唤',width: 120 }
+ , { field: '浼氳鏈堜唤', title: '浼氳鏈堜唤' }
+ , { field: '缁勪唬鐮�', title: '缁勪唬鐮�' }
+ , { field: '缁勫悕绉�', title: '缁勫悕绉�', width: 190 }
+ , { field: '鎬婚噾棰�', title: '鎬婚噾棰�' }
+ , { field: '鎬诲熀鏁�', title: '鎬诲熀鏁�' }
+ , { field: '骞冲潎宸ヨ祫', title: '骞冲潎宸ヨ祫' }
+ , { field: '鏃ュ钩鍧囧伐璧�', title: '鏃ュ钩鍧囧伐璧�', width: 130 }
+ , { field: '淇骞冲潎宸ヨ祫', title: '淇骞冲潎宸ヨ祫', width: 140 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 190 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+
+ ]]
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_ClassTimePrjSub/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and 鏈堝害鏍哥畻璁板綍浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ //if (HName) {
+ // sWhere += " and 缁勫悕绉� like '%" + HName + "%'";
+ //}
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ //$("#HName").val("");
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏍哥畻璁板綍-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrjSub.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HitemID;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏍哥畻璁板綍-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrjSub.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_ClassTimePrjSub',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index 3ae9497..42bdd44 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -124,7 +124,7 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 鍒濆鍖栬〃鏍�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 8e4d432..210ed96 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -75,9 +75,9 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
- var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+ var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
@@ -201,7 +201,6 @@
sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HName + "%'";
}
get_Display(sWhere);
- sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 04d7a6a..c9a5255 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -78,7 +78,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_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/Gy_Material.html"
index f8e009d..2b51227 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_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/Gy_Material.html"
@@ -94,7 +94,7 @@
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -223,7 +223,7 @@
table.render(option);
layer.close(wait);
} else {
- layer.close(index);
+ layer.close(wait);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
index df51c4f..9c685b5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
@@ -25,14 +25,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�т唬鐮�</label>
- <div class="layui-input-block">
+ <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="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�у悕绉�</label>
- <div class="layui-input-block">
+ <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="HName" id="HName">
</div>
</div>
@@ -91,7 +91,7 @@
, page: true
,cellMinWidth: 90
, cols: [[
- { field: '閫夋嫨', title: '閫夋嫨', hide: true }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' }
, { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 6e2f4eb..defcb88 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -107,26 +107,26 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
- $.ajax({
- url: GetWEBURL() + '/Gy_Unit/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- var treeData = LoadTree(data);
- tree.render({
- elem: '#treeunit',
- data: treeData,
- id: 'treeId',
- disabled: 'disabled',
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- showLine: false
- });
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/Gy_Unit/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // var treeData = LoadTree(data);
+ // tree.render({
+ // elem: '#treeunit',
+ // data: treeData,
+ // id: 'treeId',
+ // disabled: 'disabled',
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // showLine: false
+ // });
+ // }
+ //});
var option = {
elem: '#mainTable'
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index bb9db44..da5b6af 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -85,7 +85,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
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/Pay_PeriodInfoSet.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/Pay_PeriodInfoSet.html"
new file mode 100644
index 0000000..5dc9c88
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Pay_PeriodInfoSet.html"
@@ -0,0 +1,304 @@
+锘�<!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">
+ <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/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>
+
+</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-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="HYear" id="HYear">
+ </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="HPeriod" id="HPeriod">
+ </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>
+ </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ 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
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '骞�', title: '骞翠唤' }
+ , { field: '鏈�', title: '鏈堜唤' }
+ , { field: '鍩烘湰澶╂暟', title: '鍩烘湰澶╂暟' }
+ , { field: '鍔犵彮澶╂暟', title: '鍔犵彮澶╂暟' }
+ , { field: '鍩烘湰宸ヨ祫', title: '鍩烘湰宸ヨ祫' }
+ , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+
+ ]]
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PeriodInfoSet/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HYear").val();
+ var HName = $("#HPeriod").val();
+ if (HNumber) {
+ sWhere += " and 骞翠唤 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 鏈堜唤 like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HYear").val("");
+ $("#HPeriod").val("");
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏈堜唤璁剧疆-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Pay_PeriodInfoSet.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏈堜唤璁剧疆-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Pay_PeriodInfoSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetPay_PeriodInfoSet',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
index dbc04db..6a81bf5 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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//鍒濆鍖栫晫闈�
set_ClearBill();
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
index 47edaf6..7094857 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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
@@ -38,7 +38,7 @@
End
Item
Name='鎺ユ敹鍗曚綅'
- DBFieldName='璋冨叆缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鐗╂枡浠ｇ爜'
@@ -53,7 +53,7 @@
Name='璁￠噺鍗曚綅'
End
Item
- Name='瀹炴敹鏁伴噺'
+ Name='瀹炲彂鏁伴噺'
End
Item
Name='琛ㄤ綋澶囨敞'
@@ -232,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
Item
Column='Column12'
@@ -630,7 +630,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
index 851c307..ff0dbee 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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
@@ -34,7 +34,7 @@
End
Item
Name='鍙戝嚭鍗曚綅'
- DBFieldName='璋冨嚭缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鎺ユ敹鍗曚綅'
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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
index 3f1d7b7..89ae039 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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
@@ -31,10 +31,11 @@
End
Item
Name='浠撳簱'
+ DBFieldName='浠撳簱鍚嶇О'
End
Item
Name='鍙戝嚭鍗曚綅'
- DBFieldName='璋冨嚭缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鎺ユ敹鍗曚綅'
@@ -53,10 +54,11 @@
Name='璁￠噺鍗曚綅'
End
Item
- Name='瀹炴敹鏁伴噺'
+ Name='瀹炲彂鏁伴噺'
End
Item
Name='琛ㄤ綋澶囨敞'
+ DBFieldName='瀛愬娉�'
End
Item
Name='鍒跺崟浜�'
@@ -229,7 +231,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
Item
Column='Column12'
@@ -722,7 +724,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
index 6990374..accb8c7 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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
@@ -31,6 +31,7 @@
End
Item
Name='鏀舵枡浠撳簱'
+ DBFieldName='鏀舵枡浠撳簱鍚嶇О'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -38,7 +39,7 @@
End
Item
Name='鎺ユ敹鍗曚綅'
- DBFieldName='璋冨叆缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鐗╂枡浠ｇ爜'
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
index dbcf8ba..2494537 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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
@@ -38,7 +38,7 @@
End
Item
Name='鎺ユ敹鍗曚綅'
- DBFieldName='璋冨叆缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鐗╂枡浠ｇ爜'
@@ -53,7 +53,7 @@
Name='璁￠噺鍗曚綅'
End
Item
- Name='瀹炴敹鏁伴噺'
+ Name='瀹炲彂鏁伴噺'
End
Item
Name='瀛愬娉�'
@@ -232,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
Item
Column='Column12'
@@ -630,7 +630,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='瀹炴敹鏁伴噺'
+ DataField='瀹炲彂鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
index 34d56e6..2c36234 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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
@@ -34,7 +34,7 @@
End
Item
Name='鍙戝嚭鍗曚綅'
- DBFieldName='璋冨嚭缁勭粐'
+ DBFieldName='搴撳瓨缁勭粐'
End
Item
Name='鎺ユ敹鍗曚綅'
@@ -391,7 +391,7 @@
Width=5.42396
Height=0.396875
TextAlign=MiddleCenter
- Text='鍣ㄥ叿鍏朵粬鍑哄簱鍗�'
+ Text='鍣ㄥ叿鏀瑰埗鍑哄簱鍗�'
End
Item
Type=MemoBox
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherInStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherInStockBill.aspx"
index d844b86..239a0fc 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/xmlLBM_MouldOtherInStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherInStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldOtherInStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldOtherInBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬)閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,max(璁￠噺鍗曚綅)璁￠噺鍗曚綅,max(琛ㄤ綋澶囨敞)琛ㄤ綋澶囨敞 from h_v_Sc_MouldOtherInBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱,琛ㄤ綋澶囨敞 order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherOutStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherOutStockBill.aspx"
index 995a2a6..eaa531d 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/xmlLBM_MouldOtherOutStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldOtherOutStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherOutStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherOutStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldOtherOutStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldOtherOutBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,max(閮ㄩ棬)閮ㄩ棬,瑙勬牸鍨嬪彿,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,max(璁￠噺鍗曚綅)璁￠噺鍗曚綅,MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱,max(鏃ユ湡)鏃ユ湡,max(琛ㄤ綋澶囨敞)琛ㄤ綋澶囨敞 from h_v_Sc_MouldOtherOutBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱,琛ㄤ綋澶囨敞 order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairInStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairInStockBill.aspx"
index 28cecaa..59b0d7d 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/xmlLBM_MouldRepairInStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairInStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldRepairInStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldRepairInBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬)閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炴敹鏁伴噺)瀹炴敹鏁伴噺,max(璁￠噺鍗曚綅)璁￠噺鍗曚綅,max(瀛愬娉�)瀛愬娉� from h_v_Sc_MouldRepairInBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱,瀛愬娉� order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairOutStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairOutStockBill.aspx"
index 6ba368a..d44665a 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/xmlLBM_MouldRepairOutStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldRepairOutStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairOutStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairOutStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldRepairOutStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldRepairOutBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬)閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炴敹鏁伴噺)瀹炴敹鏁伴噺,max(璁￠噺鍗曚綅)璁￠噺鍗曚綅,max(瀛愬娉�)瀛愬娉� from h_v_Sc_MouldRepairOutBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱,瀛愬娉� order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapInStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapInStockBill.aspx"
index 9bb97bd..d58055c 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/xmlLBM_MouldScrapInStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapInStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldScrapInStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldScrapInHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬鍚嶇О)閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鏀舵枡浠撳簱鍚嶇О,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炴敹鏁伴噺)瀹炴敹鏁伴噺,max(璁￠噺鍗曚綅鍚嶇О)璁￠噺鍗曚綅,max(瀛愬娉�)瀛愬娉� from h_v_Sc_MouldScrapInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,鏀舵枡浠撳簱鍚嶇О,瀛愬娉� order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapOutStockBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapOutStockBill.aspx"
index edc7350..5f6eef1 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/xmlLBM_MouldScrapOutStockBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldScrapOutStockBill.aspx"
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select MAX(搴撳瓨缁勭粐)搴撳瓨缁勭粐,max(閮ㄩ棬鍚嶇О) 閮ㄩ棬,max(鍗曟嵁鍙�)鍗曟嵁鍙�,浠撳簱鍚嶇О,max(鏃ユ湡)鏃ユ湡,鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,max(璁￠噺鍗曚綅鍚嶇О)璁￠噺鍗曚綅,瀛愬娉� from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,鎵规,浠撳簱鍚嶇О,瀛愬娉� order by 鍗曟嵁鍙�");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2c334bf..0e894d9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,7 +84,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 524c6be..442c051 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,7 +82,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
index 53dd67e..c0c3aa1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList.html"
@@ -284,49 +284,7 @@
};
});
- //function set_InitGrid() {
- // option = {
- // elem: '#mainTable'
- // , toolbar: '#toolbarDemo'
- // , height: 'full-50'
- // , page: true
- // , cellMinWidth: 90
- // , limits: [50, 500, 1000, 5000]
- // , cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- // , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- // , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 160, hide: true }
- // , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 200 }
- // , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 200 }
- // , { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜', width: 200, hide: true }
- // , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
- // , { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 200 }
- // , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 200 }
- // , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 }
- // , { field: '浜у湴浠ｇ爜', title: '浜у湴浠ｇ爜', width: 200 }
- // , { field: '浜у湴', title: '浜у湴', width: 200, hide: true }
- // , { field: '鍔犲伐绫诲瀷浠ｇ爜', title: '鍔犲伐绫诲瀷浠ｇ爜', width: 200 }
- // , { field: '鍔犲伐绫诲瀷', title: '鍔犲伐绫诲瀷', width: 200 }
- // , { field: '鎷変笣鏂瑰悜', title: '鎷変笣鏂瑰悜', width: 200 }
- // , { field: '鍖呰鏂瑰紡浠ｇ爜', title: '鍖呰鏂瑰紡浠ｇ爜', width: 200 }
- // , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', width: 200 }
- // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
- // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
- // , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
- // , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 }
- // , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- // , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 }
- // , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- // , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
- // , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- // , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 115 }
- // , { field: 'hsubid', title: 'hsubid', width: 115, hide: true }
- // ]]
- // };
- //}
+
//#region 鏌ヨ
function RoadHBillNo(sqlWhere) {
var ajaxLoad = layer.load();
@@ -364,30 +322,7 @@
}
//#endregion
- ////#region 鍔犺浇缃戠粶
- //function get_Display(sWhere) {
- // var wait = layer.load();//閬僵
- // //鍔犺浇鏁版嵁鍒扮綉鏍�
- // $.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/QC_LastPieceCheckBill/GetLastPieceCheckBillList',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(wait);
- // } else {
- // layer.close(wait);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(wait);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- //}
+
////#endregion
//#region 蹇�熻繃婊�
@@ -491,107 +426,7 @@
active[type] ? active[type].call(this) : '';
});
- ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- //$.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/QC_LastPieceCheckBill/GetLastPieceCheckBillList',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- //});
-
- ////淇敼鎸夐挳
- //form.on('submit(btnModify)', function (data) {
- // var checkStatus = table.checkStatus('mainTable')
- // , data = checkStatus.data;
- // layer.open({
- // type: 2
- // , area: ['100%', '100%']
- // , title: '浜у搧鍏ュ簱妫�楠屽崟'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['QC_LastPieceCheckBill.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
- // , resize: false
- // })
- //});
-
-
-
- ////鏌ヨ鎸夐挳
- //form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- // //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
- // //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- // //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
- // //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
- // //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
- // //if (HBillNo) {
- // // sWhere += " and HBillNo like '%" + HBillNo + "%'";
- // //}
- // //if (HCreateBy) {
- // // sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
- // //}
- // //if (BenginHCreateDate) {
- // // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
- // //}
- // //if (EndHCreateDate) {
- // // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
- // //}
- // var index = layer.load(0);
- // $.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL1() + '/QC_LastPieceCheckBill/GetLastPieceCheckBillList',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- // });
- // //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- // sWhere = "";
- // //$("#HBillType").val("");//鍗曟嵁绫诲瀷
- // //$("#HBillNo").val("");//鍗曟嵁鍙�
- // //$("#HSourceBillNo").val("");//婧愬崟鍙�
- // //$("#HCreateBy").val("");//鍒跺崟浜�
- // //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- // //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
- //});
-
- ////鐩戝惉琛屽弻鍑讳簨浠�
- //table.on('rowDouble(mainTable)', function (obj) {
- // layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- //});
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
+
//浠ヤ笂鏄痩ayui妯″潡
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_POOrderBillList.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_POOrderBillList.html"
index ff4c1d3..91f60fd 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_POOrderBillList.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_POOrderBillList.html"
@@ -86,12 +86,12 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>鍒嗛厤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>鍙戝竷</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>鎾ら攢</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj"><i class="layui-icon layui-icon-tips"></i>浼樺厛绾�</button>
-
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -167,6 +167,8 @@
//浼樺厛绾�
case 'btn-yxj': set_Yxj();
break;
+ case 'btn-back': set_Back();
+ break;
};
});
@@ -234,6 +236,7 @@
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', hide: true }
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
+ , { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120}
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
@@ -759,7 +762,6 @@
}
-
//鍙戝竷
function set_Release() {
var hmainid = '';
@@ -797,6 +799,45 @@
});
}
+ //鎾ら攢
+ function set_Back() {
+ var hmainid = '';
+ var checkStatus = table.checkStatus('mainTable'),
+ data = checkStatus.data;
+ if (checkStatus.data.length == 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ for (var i = 0; i < data.length; i++) {
+ hmainid += data[i]["hmainid"] + ',';
+ if (data[i]["涓氬姟鐘舵��"] != "宸插彂甯�") {
+ return layer.msg('鍗曟嵁鍙凤細' + data[i]["鍗曟嵁鍙�"] + '鏈彂甯�');
+ }
+ if (data[i]["渚涘簲鍟嗗崗鍚岀姸鎬�"] != "鏈‘璁�") {
+ return layer.msg('鍗曟嵁鍙凤細' + data[i]["鍗曟嵁鍙�"] + '锛屼緵搴斿晢宸茬‘璁�');
+ }
+ }
+ hmainid = hmainid.substring(0, hmainid.length - 1)
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Back',
+ async: false,
+ type: "GET",
+ dataType: "json",
+ data: { "Hmainid": hmainid },
+ success: function (data1) {
+ if (data1.Message.indexOf("鎴愬姛") > 0) {
+ layer.msg("鎿嶄綔鎴愬姛", { time: 1 * 1000, icon: 1 }, function () {
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ });
+ }
+
//浼樺厛绾�
function set_Yxj() {
var hmainid = '';
--
Gitblit v1.9.1