From 32334b45ccc19b02a55447337098c997ce35c617 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 16:54:28 +0800
Subject: [PATCH] 资产状态，变动方式

---
 WebTM/views/基础资料/设备基础资料/Gy_CardChangeType.html     |  417 ++++++++++
 WebTM/views/基础资料/设备基础资料/Gy_CardChangeTypeList.html |  640 ++++++++++++++++
 WebTM/views/基础资料/设备基础资料/Gy_CardType.html           |   14 
 WebTM/views/基础资料/设备基础资料/Gy_CardAddress.html        |   11 
 WebTM/views/基础资料/设备基础资料/Gy_CardAddressList.html    |   43 
 WebTM/views/基础资料/设备基础资料/Gy_CardStatus.html         |  417 ++++++++++
 WebTM/views/基础资料/设备基础资料/Gy_CardStatusList.html     |  640 ++++++++++++++++
 WebTM/views/基础资料/设备基础资料/Gy_CardTypeList.html       |   43 
 WebTM/WebTM.csproj                                 |    4 
 9 files changed, 2,192 insertions(+), 37 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f76e442..d727ed4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -369,8 +369,12 @@
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
+    <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
+    <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
+    <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeTypeList.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardType.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddressList.html" />
+    <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatusList.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardTypeList.html" />
     <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
     <Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddress.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddress.html"
index b4a2f6d..29db698 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddress.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddress.html"
@@ -35,12 +35,9 @@
                     <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_AddNew" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" id="exit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                                <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Stop" id="set_Stop">绂佺敤</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonStop" id="set_AbandonStop">鍙嶇鐢�</button>-->
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -200,6 +197,12 @@
             parent.layer.close(index); //鍐嶆墽琛屽叧闂�
         });
 
+        //鏂板鎸夐挳
+        form.on('submit(set_AddNew)', function () {//鎻愪氦
+            layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                location.replace('Gy_CardAddress.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
+            });
+        })
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
index ff6c8af..8c4f645 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
@@ -74,14 +74,14 @@
                         <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" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button> 
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                             </div>
                         </script>
@@ -197,7 +197,7 @@
                             table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "Gy_Unit";
+                            var HBillType = "Gy_CardAddress";
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -252,7 +252,7 @@
                     //鎸夐挳璁剧疆
                     case 'set_HideButton':
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "Gy_Unit";
+                        var HBillType = "Gy_CardAddress";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
@@ -267,6 +267,9 @@
                     , title: '璧勪骇浣嶇疆-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../璁惧鍩虹璧勬枡/Gy_CardAddress.html?OperationType=1&linterid=&HSouceBillType='
+                    , end: function () {
+                        get_FastQuery();
+                    }
                 })
             }
             //#endregion
@@ -284,6 +287,9 @@
                         , title: '璧勪骇浣嶇疆鍒楄〃-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../璁惧鍩虹璧勬枡/Gy_CardAddress.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            get_FastQuery();
+                        }
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -335,6 +341,9 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery() {
+                //鍒濆鍖栬繃婊ゆ潯浠�
+                sWhere = "";
+
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 var ColName = $("#ColName").val();//澶嶉�夋
@@ -500,6 +509,12 @@
                         } else {
                             table.render(option);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardAddress";
+                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -534,11 +549,11 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
+                    var InterID = data[0].hmainid.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Unit/AuditGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_CardAddress/AuditGy_CardAddress", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -570,11 +585,11 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
+                    var InterID = data[0].hmainid.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Unit/StopGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_CardAddress/StopGy_CardAddress", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeType.html"
new file mode 100644
index 0000000..178a2b2
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeType.html"
@@ -0,0 +1,417 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鍙樺姩鏂瑰紡缂栬緫</title>
+    <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>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
+
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+    </style>
+</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="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_AddNew" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="exit-btn" 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">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                </ul>
+                                <h1 style="text-align:center;margin-top:5px;"><b>鍙樺姩鏂瑰紡</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠ｇ爜锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                        <input id="HItemID" name="HItemID" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                            <option value="鏈娴�" selected>鏈娴�</option>
+                                                            <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                            <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浣跨敤缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                    <div class="layui-input-inline ">
+                                                        <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙ｆā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鑾峰彇 閫掑叆鍙傛暟
+        var params = getUrlVars();
+        var hID = params[params[1]];//缂栬緫鏌ョ湅
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        if (hID == null || hID == 0) {
+            //id new
+            $("#HItemID").val(0);
+        }
+        else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+            $("#HItemID").val(hID);
+            //淇敼鏃朵富琛↖D
+            RoadBillMain(hID);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //瀹℃牳
+        form.on('submit(set_CheckBill)', function (data) {
+            set_CheckBill(data);
+        });
+
+        //鍙嶅鏍�
+        form.on('submit(set_AbandonCheck)', function (data) {
+            set_AbandonCheck(data);
+        });
+
+        //绂佺敤
+        form.on('submit(set_Stop)', function (data) {
+            set_Stop(data);
+        });
+
+        //鍙嶇鐢�
+        form.on('submit(set_AbandonStop)', function (data) {
+            set_AbandonStop(data);
+        });
+
+        //淇濆瓨鎸夐挳
+        form.on('submit(Saver)', function (data) {
+            Saver(data);
+
+        });
+
+        form.on('submit(Exit)', function (data) {//閫�鍑�
+            var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+            parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+        });
+
+        //鏂板鎸夐挳
+        form.on('submit(set_AddNew)', function () {//鎻愪氦
+            layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                location.replace('Gy_CardChangeType.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
+            });
+        })
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        function set_ClearBill() {
+            Organ();
+        }
+
+        //鏌ヨ缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HUSEORGID").append(Organization);
+                        $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        //淇濆瓨
+        function Saver(data) {
+            if ($("#HNumber").val() == "") {
+                layer.msg("璇疯緭鍏ヤ唬鐮侊紒");
+                return;
+            }
+            if ($("#HName").val() == "") {
+                layer.msg("璇疯緭鍏ュ悕绉帮紒");
+                return;
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            $.ajax(
+                {
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_CardChangeType/SaveGy_CardChangeType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+                    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 {
+                            layer.msg(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err);
+                    }
+                });
+        }
+
+        //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+        function RoadBillMain(hID)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + hID;
+            $.ajax({
+                url: GetWEBURL() + "Gy_CardChangeType/list",
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HItemID": data.hmainid
+                            , "HNumber": data.鍙樺姩鏂瑰紡浠ｇ爜
+                            , "HName": data.鍙樺姩鏂瑰紡鍚嶇О
+                            , "HHelpCode": data.鍔╄鐮�
+                            , "HUseFlag": data.浣跨敤鏍囪
+                            , "HUSEORGID": data.HUSEORGID
+                            , "HRemark": data.澶囨敞
+                            , "HStopflag": data.绂佺敤鏍囪
+                        });
+
+                        $("#HUSEORGID").val(data.HUSEORGID);
+                        $("#HUseFlag").val(data.浣跨敤鏍囪);
+                        //绂佺敤鏍囪
+                        if (data.绂佺敤鏍囧織 == "true") {
+                            $("input[name='HStopflag'][value='" + data.绂佺敤鏍囪 + "']").attr("checked", true);
+                        }
+                        form.render("select");
+                        form.render("checkbox");
+
+                    } else {
+                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
+
+        //瀹℃牳
+        function set_CheckBill() {
+            layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/AuditGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //鍙嶅鏍�
+        function set_AbandonCheck() {
+            layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/AuditGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //绂佺敤
+        function set_Stop() {
+            layer.confirm("纭瑕佺鐢ㄥ悧?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/StopGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //鍙嶇鐢�
+        function set_AbandonStop() {
+            layer.confirm("纭瑕佸弽绂佺敤鍚�?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/StopGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        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
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeTypeList.html"
new file mode 100644
index 0000000..e1c06bc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardChangeTypeList.html"
@@ -0,0 +1,640 @@
+锘�<!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/HideButton.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" 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" 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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>                              
+                                <div class="layui-colla-content" 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" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </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" style="display:none;" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            </div>
+                        </script>
+                    </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/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"]
+            var HModName = "Gy_CardChangeTypeList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID","hparentid","hmainid","HUnitID","HUSEORGID"];
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [100, 500, 5000, 50000]
+                    , limit: 100
+                    , cellMinWidth: 90
+                };
+            }
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();    
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_CardChangeType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [100, 500, 5000, 50000]
+                                , limit: 100
+                                , cellMinWidth: 90
+                            }
+                            table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_CardChangeType";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            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 });
+                    }
+
+                });
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;                  
+                    case 'set_ShowBill': set_ShowBill();                        
+                        break;
+                    case 'set_DeleteBill': set_DeleteBill();                       
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardChangeType";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鍙樺姩鏂瑰紡-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../璁惧鍩虹璧勬枡/Gy_CardChangeType.html?OperationType=1&linterid=&HSouceBillType='
+                    , end: function () {
+                        get_FastQuery();                        
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鍙樺姩鏂瑰紡鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../璁惧鍩虹璧勬枡/Gy_CardChangeType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            get_FastQuery();
+                        }
+                    })
+                } 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].hmainid.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_CardChangeType',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
+                            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_FastQuery() {
+                //鍒濆鍖栬繃婊ゆ潯浠�
+                sWhere = "";
+
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").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 (HNumber) {
+                    sWhere += " and 鍙樺姩鏂瑰紡浠ｇ爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鍙樺姩鏂瑰紡鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; 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 - 2; 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);
+                        }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardChangeType";
+                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#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 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_CardChangeType/AuditGy_CardChangeType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_CardChangeType/StopGy_CardChangeType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#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
+
+            layer.close(index)
+
+            //浠ヤ笂鏄痩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/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatus.html"
new file mode 100644
index 0000000..a95936f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatus.html"
@@ -0,0 +1,417 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>璧勪骇鐘舵�佺紪杈�</title>
+    <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>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
+
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+    </style>
+</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="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_AddNew" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="exit-btn" 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">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                </ul>
+                                <h1 style="text-align:center;margin-top:5px;"><b>璧勪骇鐘舵��</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠ｇ爜锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                        <input id="HItemID" name="HItemID" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                            <option value="鏈娴�" selected>鏈娴�</option>
+                                                            <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                            <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浣跨敤缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                    <div class="layui-input-inline ">
+                                                        <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙ｆā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鑾峰彇 閫掑叆鍙傛暟
+        var params = getUrlVars();
+        var hID = params[params[1]];//缂栬緫鏌ョ湅
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        if (hID == null || hID == 0) {
+            //id new
+            $("#HItemID").val(0);
+        }
+        else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+            $("#HItemID").val(hID);
+            //淇敼鏃朵富琛↖D
+            RoadBillMain(hID);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //瀹℃牳
+        form.on('submit(set_CheckBill)', function (data) {
+            set_CheckBill(data);
+        });
+
+        //鍙嶅鏍�
+        form.on('submit(set_AbandonCheck)', function (data) {
+            set_AbandonCheck(data);
+        });
+
+        //绂佺敤
+        form.on('submit(set_Stop)', function (data) {
+            set_Stop(data);
+        });
+
+        //鍙嶇鐢�
+        form.on('submit(set_AbandonStop)', function (data) {
+            set_AbandonStop(data);
+        });
+
+        //淇濆瓨鎸夐挳
+        form.on('submit(Saver)', function (data) {
+            Saver(data);
+
+        });
+
+        form.on('submit(Exit)', function (data) {//閫�鍑�
+            var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+            parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+        });
+
+        //鏂板鎸夐挳
+        form.on('submit(set_AddNew)', function () {//鎻愪氦
+            layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                location.replace('Gy_CardStatus.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
+            });
+        })
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        function set_ClearBill() {
+            Organ();
+        }
+
+        //鏌ヨ缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HUSEORGID").append(Organization);
+                        $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        //淇濆瓨
+        function Saver(data) {
+            if ($("#HNumber").val() == "") {
+                layer.msg("璇疯緭鍏ヤ唬鐮侊紒");
+                return;
+            }
+            if ($("#HName").val() == "") {
+                layer.msg("璇疯緭鍏ュ悕绉帮紒");
+                return;
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            $.ajax(
+                {
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_CardStatus/SaveGy_CardStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+                    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 {
+                            layer.msg(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err);
+                    }
+                });
+        }
+
+        //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+        function RoadBillMain(hID)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + hID;
+            $.ajax({
+                url: GetWEBURL() + "Gy_CardStatus/list",
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HItemID": data.hmainid
+                            , "HNumber": data.璧勪骇鐘舵�佷唬鐮�
+                            , "HName": data.璧勪骇鐘舵�佸悕绉�
+                            , "HHelpCode": data.鍔╄鐮�
+                            , "HUseFlag": data.浣跨敤鏍囪
+                            , "HUSEORGID": data.HUSEORGID
+                            , "HRemark": data.澶囨敞
+                            , "HStopflag": data.绂佺敤鏍囪
+                        });
+
+                        $("#HUSEORGID").val(data.HUSEORGID);
+                        $("#HUseFlag").val(data.浣跨敤鏍囪);
+                        //绂佺敤鏍囪
+                        if (data.绂佺敤鏍囧織 == "true") {
+                            $("input[name='HStopflag'][value='" + data.绂佺敤鏍囪 + "']").attr("checked", true);
+                        }
+                        form.render("select");
+                        form.render("checkbox");
+
+                    } else {
+                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
+
+        //瀹℃牳
+        function set_CheckBill() {
+            layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/AuditGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //鍙嶅鏍�
+        function set_AbandonCheck() {
+            layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/AuditGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //绂佺敤
+        function set_Stop() {
+            layer.confirm("纭瑕佺鐢ㄥ悧?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/StopGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        //鍙嶇鐢�
+        function set_AbandonStop() {
+            layer.confirm("纭瑕佸弽绂佺敤鍚�?", function (index) {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaterType/StopGy_MaterType',
+                    type: "GET",
+                    data: { "HInterID": $("#HItemID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 });
+                            layer.close(wait);
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
+
+        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
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatusList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatusList.html"
new file mode 100644
index 0000000..7bd9f13
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardStatusList.html"
@@ -0,0 +1,640 @@
+锘�<!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/HideButton.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" 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" 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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>                              
+                                <div class="layui-colla-content" 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" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </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" style="display:none;" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            </div>
+                        </script>
+                    </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/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"]
+            var HModName = "Gy_CardStatusList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID","hparentid","hmainid","HUnitID","HUSEORGID"];
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [100, 500, 5000, 50000]
+                    , limit: 100
+                    , cellMinWidth: 90
+                };
+            }
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();    
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_CardStatus/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [100, 500, 5000, 50000]
+                                , limit: 100
+                                , cellMinWidth: 90
+                            }
+                            table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_CardStatus";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            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 });
+                    }
+
+                });
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;                  
+                    case 'set_ShowBill': set_ShowBill();                        
+                        break;
+                    case 'set_DeleteBill': set_DeleteBill();                       
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardStatus";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '璧勪骇鐘舵��-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../璁惧鍩虹璧勬枡/Gy_CardStatus.html?OperationType=1&linterid=&HSouceBillType='
+                    , end: function () {
+                        get_FastQuery();                        
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '璧勪骇鐘舵�佸垪琛�-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../璁惧鍩虹璧勬枡/Gy_CardStatus.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            get_FastQuery();
+                        }
+                    })
+                } 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].hmainid.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_CardStatus',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
+                            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_FastQuery() {
+                //鍒濆鍖栬繃婊ゆ潯浠�
+                sWhere = "";
+
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").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 (HNumber) {
+                    sWhere += " and 璧勪骇鐘舵�佷唬鐮� like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 璧勪骇鐘舵�佸悕绉� like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; 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 - 2; 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);
+                        }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardStatus";
+                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#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 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_CardStatus/AuditGy_CardStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_CardStatus/StopGy_CardStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#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
+
+            layer.close(index)
+
+            //浠ヤ笂鏄痩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/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardType.html"
index aabe587..cd505fe 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardType.html"
@@ -35,12 +35,9 @@
                     <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_AddNew" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" id="exit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                                <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Stop" id="set_Stop">绂佺敤</button>
-                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonStop" id="set_AbandonStop">鍙嶇鐢�</button>-->
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -204,10 +201,17 @@
             parent.layer.close(index); //鍐嶆墽琛屽叧闂�
         });
 
-        //#region 閫夋嫨閮ㄩ棬鎸夐挳
+        //#region 閫夋嫨璁￠噺鍗曚綅鎸夐挳
         form.on('submit(HUnitList)', function () {
             get_checkUnit();
         });
+
+        //鏂板鎸夐挳
+        form.on('submit(set_AddNew)', function () {//鎻愪氦
+            layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                location.replace('Gy_CardType.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
+            });
+        })
         //#endregion
 
         //#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardTypeList.html"
index c68acd4..b5abd9c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardTypeList.html"
@@ -74,14 +74,14 @@
                         <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" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                             </div>
                         </script>
@@ -197,7 +197,7 @@
                             table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "Gy_Unit";
+                            var HBillType = "Gy_CardType";
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -252,7 +252,7 @@
                     //鎸夐挳璁剧疆
                     case 'set_HideButton':
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "Gy_Unit";
+                        var HBillType = "Gy_CardType";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
@@ -267,6 +267,9 @@
                     , title: '璧勪骇绫诲埆-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../璁惧鍩虹璧勬枡/Gy_CardType.html?OperationType=1&linterid=&HSouceBillType='
+                    , end: function () {
+                        get_FastQuery();
+                    }
                 })
             }
             //#endregion
@@ -284,6 +287,9 @@
                         , title: '璧勪骇绫诲埆鍒楄〃-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../璁惧鍩虹璧勬枡/Gy_CardType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            get_FastQuery();
+                        }
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -335,6 +341,9 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery() {
+                //鍒濆鍖栬繃婊ゆ潯浠�
+                sWhere = "";
+
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 var ColName = $("#ColName").val();//澶嶉�夋
@@ -500,6 +509,12 @@
                         } else {
                             table.render(option);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_CardType";
+                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -534,11 +549,11 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
+                    var InterID = data[0].hmainid.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Unit/AuditGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_CardType/AuditGy_CardType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -570,11 +585,11 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
+                    var InterID = data[0].hmainid.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Unit/StopGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_CardType/StopGy_CardType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {

--
Gitblit v1.9.1