From dbb079ee8ff7513e28abccc6a00b3cd4fba11bd9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期六, 08 六月 2024 13:24:55 +0800
Subject: [PATCH] 1.会计期间列表增加结账按钮,已经结账的不能审核,反审核,删除 2.会计期间结账后,把结账的出入库数据插入期初库存表 3.增加期初库存报表

---
 WebTM/WebTM.csproj.user                              |    4 
 WebTM/views/系统管理/会计期间/Xt_AccountPeriodAdd.html       |  243 ++++++++++++++
 WebTM/views/仓存管理/条码报表/Kf_ICInvBalList.html           |  600 +++++++++++++++++++++++++++++++++++
 WebTM/layuiadmin/Scripts/webConfig.js                |    4 
 WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html |    4 
 WebTM/views/系统管理/会计期间/Xt_AccountPeriodList.html      |  126 +++---
 WebTM/WebTM.csproj                                   |    2 
 7 files changed, 913 insertions(+), 70 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5ef96fe..1a4ed78 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -314,6 +314,7 @@
     <Content Include="views\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInvBalList.html" />
     <Content Include="views\浠撳瓨绠$悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
     <Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
@@ -360,6 +361,7 @@
     <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+    <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodAdd.html" />
     <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 147597a..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index c36c116..9d3c902 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/";    //鐜嬪浆鏈湴閰嶇疆
     /*var WEBURL = "http://localhost:8083/API/";  //闄堥洴闈欐湰鍦伴厤缃�*/
-    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
-    /*var WEBURL = "http://localhost:8082/API/"; */   //寮犵憺骞挎湰鍦伴厤缃�
+   // var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/API/";   //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
index ee75e69..5088f60 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
@@ -103,6 +103,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>鏌ヨ</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Proofread" id="Proofread"><i class="layui-icon layui-icon-radio"></i>搴撳瓨鏍″</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></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>
@@ -327,6 +328,9 @@
                     //鏌ヨ鎸夐挳
                     case 'btn_Query': get_Display();
                         break;
+                    //搴撳瓨鏍″鎸夐挳
+                    case 'btn_Proofread': get_Proofread();
+                        break;
                     //閫�鍑烘寜閽�
                     case 'btn_Exit': Pub_Close(2);
                         break;
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInvBalList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInvBalList.html"
new file mode 100644
index 0000000..a0965f2
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInvBalList.html"
@@ -0,0 +1,600 @@
+锘�<!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>
+    <script src="../../../layuiadmin/soulTable.slim.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="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">骞翠唤</label>
+                                    <div class="layui-input-block" style="width:160px">
+                                        <select name="HYear" id="HYear" lay-verify="HYear" >
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏈堜唤</label>
+                                    <div class="layui-input-block" style="width:160px">
+                                        <select name="HPeriod" id="HPeriod" lay-verify="HPeriod" readonly>
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </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-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class=" ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </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_Export" id="Export"><i class="layui-icon layui-icon-export"></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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+                , soulTable = layui.soulTable
+
+            var option = [];
+            var sWhere = "";
+            var HModName = "Kf_ICInvBalList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [ ];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': get_Export();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
+            //#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
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                    get_FastQuery(2);
+
+                } else {
+                    get_FastQuery(1);
+                }
+                Year();//骞翠唤
+                Month();//鏈堜唤
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    , limit: 50
+                    , limits: [50, 500, 5000, 50000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/WEBSController/GetKf_ICInvBalList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            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' });
+                            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: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                            //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(number) {
+
+                var HMaterNumber = $("#HMaterNumber").val();            //鐗╂枡缂栫爜
+                var HMaterName = $("#HMaterName").val();                //鐗╂枡鍚嶇О
+                var HModel = $("#HModel").val();               //瑙勬牸鍨嬪彿
+                var HYear = $("#HYear").val();               //骞翠唤
+                var HPeriod = $("#HPeriod").val();               //鏈堜唤
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                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 (HMaterNumber) {
+                    sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+                }
+                if (HModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+                }
+                if (HYear) {
+                    sWhere += " and 骞翠唤 like '%" + HYear + "%'";
+                }
+                if (HPeriod) {
+                    sWhere += " and 鏈堜唤 like '%" + HPeriod + "%'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HMaterNumber").val();
+                $("#HMaterName").val("");
+                $("#HModel").val("");
+                $("#Year").val();
+                $("#HPeriod").val();
+
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            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');
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgID = params[params[1]];
+                if (openType == 2) {
+                    sWhere += " and HBillStatus=2 ";
+                    $("#HOrgID").val(HOrgID);
+                    form.render("select");
+                    return true;
+                }
+                return false;
+            }
+            //#endregion
+
+            //浼氳骞�
+            function Year() {
+                var yyyy = new Date().getFullYear();
+                var YearOption = "";
+                for (var i = 0; i <= 10; i++) {
+                    YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+                }
+                $("#HYear").append(YearOption);
+                $("#HYear").val(yyyy)
+                form.render('select');
+            }
+
+            //浼氳鏈�
+            function Month() {
+                var MM = new Date().getMonth() + 1;
+                var MonthOption = "";
+                for (var i = 1; i <= 12; i++) {
+                    MonthOption += '<option  style="color:blue;" value="' + i + '">' + i + '</option>';
+                }
+                $("#HPeriod").append(MonthOption);
+                $("#HPeriod").val(MM)
+                form.render('select');
+            }
+
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodAdd.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodAdd.html"
new file mode 100644
index 0000000..74fe767
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodAdd.html"
@@ -0,0 +1,243 @@
+锘�<!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">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <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="Exit">閫�鍑�</button>
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 80px">骞达細</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="HYear" id="HYear" lay-verify="HYear" autocomplete="off" placeholder="" class="layui-input" readonly>
+                                                    <!--<select name="HYear" id="HYear" lay-verify="HYear" >
+                                                        鍔ㄦ�佹覆鏌撶粍缁�
+                                                    </select>-->
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 80px">鏈堬細</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+                                                    <input type="text" name="HPeriod" id="HPeriod" lay-verify="HPeriod" autocomplete="off" placeholder="" class="layui-input" readonly>
+                                                    <!--<select name="HPeriod" id="HPeriod" lay-verify="HPeriod" readonly>-->
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    <!--</select>-->
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">                                           
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 80px;">寮�濮嬫棩鏈�</label>
+                                                <div class="layui-input-block" style="width:200px">
+                                                    <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" readonly >
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 80px;">缁撴潫鏃ユ湡</label>
+                                                <div class="layui-input-block"  style="width:200px">
+                                                    <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        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]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).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;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Xt_AccountPeriod/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "oMain": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+              
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_AccountPeriod/Lastlist',
+                    type: "GET",
+                    data: { },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            // 鎻愬彇鏈�鍚庝竴鏉℃暟鎹殑淇℃伅
+                            var lastYear = data1.data[0]["浼氳骞翠唤"];
+                            var lastPeriod = data1.data[0]["浼氳鏈堜唤"];
+                            var lastEndDate = new Date(data1.data[0]["缁撴潫鏃ユ湡"]);
+
+                            // 璁$畻涓嬩竴涓椂闂存鐨勪俊鎭�
+                            var nextYear = lastPeriod === 12 ? lastYear + 1 : lastYear;
+                            var nextPeriod = lastPeriod === 12 ? 1 : lastPeriod + 1;
+                            var nextBeginDate = new Date(lastEndDate.getTime() + 86400000); // 鍔犱竴澶╃殑姣鏁�
+                            var nextEndDate = new Date(nextBeginDate.getFullYear(), nextBeginDate.getMonth() + 1, 0); // 褰撴湀鏈�鍚庝竴澶�
+                            $("#HYear").val(nextYear);
+                            $("#HPeriod").val(nextPeriod);
+                            $("#HBeginDate").val(formatDate(nextBeginDate));
+                            $("#HEndDate").val(formatDate(nextEndDate));
+                        } else {                       
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏁版嵁楠岃瘉
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            //浼氳骞�
+            function Year() {
+                var yyyy = new Date().getFullYear();
+                var YearOption = "";
+                for (var i = 0; i <= 10; i++) {
+                    YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+                }
+                $("#HYear").append(YearOption);
+                $("#HYear").val(yyyy)
+                form.render('select');
+            }
+
+            //浼氳鏈�
+            function Month() {
+                var MM = new Date().getMonth() + 1;
+                var MonthOption = "";
+                for (var i = 1; i <= 12; i++) {
+                    MonthOption += '<option  style="color:blue;" value="' + i + '">' + i + '</option>';
+                }
+                $("#HPeriod").append(MonthOption);
+                $("#HPeriod").val(MM)
+                form.render('select');
+            }
+
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
index e192455..09e4a4d 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
@@ -68,16 +68,8 @@
                         <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-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>缁撹处</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Update" id="btn_Update"><i class="layui-icon layui-icon-close-fill"></i>鍙嶇粨璐�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
@@ -135,29 +127,11 @@
                 var checkStatus = table.checkStatus(obj.config.id);
 
                 switch (obj.event) {
-                    //鍒犻櫎
-                    case "btndelete": set_DeleteBill();
+                    //缁撹处
+                    case "btn_confirm": set_newAdd();
                         break;
-                    //淇敼
-                    case "btnModify":
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (data.length != 1) {
-                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
-                        }
-
-                        var HYear = data[0].浼氳骞翠唤;
-                        var HPeriod = data[0].浼氳鏈堜唤;
-                        layer.open({
-                            type: 2
-                            , area: ['100%', '100%']
-                            , title: '浼氳鏈熼棿'
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../../绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriod_Edit.html?HYear=' + HYear + '&HPeriod=' + HPeriod + '&HType=3', 'yes']
-                            , resize: false
-                        })
+                    //鍙嶇粨璐�
+                    case "btn_Update": set_UpdateBill();
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
@@ -186,15 +160,7 @@
                     , page: true
                     , cellMinWidth: 90
                     , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    //, cols: [[
-                    //    { type: 'checkbox', fixed: 'left' }
-                    //    , { field: '浼氳骞翠唤', title: '浼氳骞翠唤' }
-                    //    , { field: '浼氳鏈堜唤', title: '浼氳鏈堜唤' }
-                    //    , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
-                    //    , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    //    , { field: '杩囪处鏍囪', title: '杩囪处鏍囪' }
-                    //]]
+                    , limits: [50, 500, 5000, 20000]                   
                 };
             }
 
@@ -305,40 +271,67 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
 
-            //鍒犻櫎
-            function set_DeleteBill() {
-                var ModRightNameDelete = 'Xt_AccountPeriod_Delete'
+            //缁撹处
+            function set_newAdd() {
+                //鍏堟煡璇㈢粨璐︽棩鏈熸槸鍚︽湁鏈鏍哥殑鍗曟嵁
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_AccountPeriod/Lastlist',
+                    type: "GET",
+                    data: {},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //娌℃湁鏈鏍哥殑鍗曟嵁鎵撳紑寮圭獥
+                            layer.open({
+                                type: 2
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['45%', '42%']
+                                , title: '缁撹处'
+                                , shift: 0//寮瑰嚭鍔ㄧ敾
+                                , content: '../../绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodAdd.html?OperationType=1&linterid=0&HSouceBillType='
+                                , btn: ['纭畾'],
+                                // 鎸夐挳1 鐨勫洖璋�
+                                end: function (index, layero, that) {
+                                    //鍒锋柊椤甸潰
+                                    $("#btnSearch").trigger('click');
+                                }
+                            })
+                           
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });                
+            }
 
+            //鍙嶇粨璐�
+            function set_UpdateBill() {
                 var checkStatus = table.checkStatus("mainTable"); //鑾峰緱褰撳墠琛屾暟鎹�
                 if (checkStatus.data.length != 1) {
                     return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
                 }
 
-                var HYear = checkStatus.data[0].HYear;
-                var HPeriod = checkStatus.data[0].HPeriod;
+                var HYear = checkStatus.data[0].浼氳骞翠唤;
+                var HPeriod = checkStatus.data[0].浼氳鏈堜唤;
 
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        $.ajax({
-                            url: GetWEBURL() + '/Xt_AccountPeriod/Delete_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "HYear": HYear, "HPeriod": HPeriod },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 1 });
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_AccountPeriod/Update_Json',
+                    type: "GET",
+                    //async: true,
+                    data: { "HYear": HYear, "HPeriod": HPeriod,"num":0},
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#btnSearch").click();
+                            layer.msg(result.Message, { icon: 1 });
 
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
-                        layer.close(index); //鍏抽棴寮瑰眰
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5 });
+                        }
                     }
-                });
+                })
             }
 
             // 閲嶇疆杩囨护鏉′欢
@@ -352,6 +345,7 @@
                 sWhere = "";
             }
 
+
             //#endregion 
 
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�

--
Gitblit v1.9.1