From 16b4d9f0c9df14dbfe10cb0e30fd2b6449f3725f Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 25 十月 2021 16:58:13 +0800
Subject: [PATCH] 1

---
 WebTM/views/基础资料/数据字典/Xt_DataDictionary_ProcList.html  |  344 ++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html           |  310 +++++++++
 WebTM/views/基础资料/数据字典/Xt_DataDictionary_Proc.html      |  456 ++++++++++++++
 WebTM/views/基础资料/数据字典/Xt_DataDictionary_TableList.html |    2 
 WebTM/views/基础资料/数据字典/Xt_DataDictionary_View.html      |  162 ++--
 WebTM/layuiadmin/Scripts/webConfig.js                  |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html  |  401 ++++++++++++
 WebTM/views/index.html                                 |    2 
 WebTM/views/基础资料/数据字典/Xt_DataDictionary_Table.html     |  182 +++--
 WebTM/WebTM.csproj                                     |    4 
 10 files changed, 1,720 insertions(+), 145 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5e72093..527534d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -122,6 +122,8 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrj.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrj.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
@@ -562,8 +564,10 @@
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
+    <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_Proc.html" />
     <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_View.html" />
     <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_Table.html" />
+    <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_ProcList.html" />
     <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_ViewList.html" />
     <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_TableList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 86637ec..802a542 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,7 +2,7 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 35ae364..75987e8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -737,6 +737,8 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">缁勭粐鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">璁¢噺鍗曚綅鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">鏍哥畻鏂瑰紡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrjSub.html">鏍哥畻璁板綍</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
                                     </dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
new file mode 100644
index 0000000..e0d4d0b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
@@ -0,0 +1,401 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鏍哥畻鏂瑰紡</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐝粍</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="z" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroup-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閮ㄩ棬</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鎵�灞炵粍</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="hparentName" id="hparentName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="hparentid" id="hparentid" class="layui-input" value="" style="float:left;width:150px;">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="hparent-BT" style="width:40px;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <!--<div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鎵�灞炵粍</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="hparentid" lay-verify="hparentid" id="hparentid">
+                                </div>
+                            </div>-->
+
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏍哥畻鏂瑰紡浠g爜</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-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏍哥畻鏂瑰紡鍚嶇О</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                <div class="layui-input-inline">
+                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs8 layui-inline">
+                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <input type="hidden" value="0" name="HParentID" id="HParentID">
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+           
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+           
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(HGroup-BT)', function () {
+                get_checkGroup();
+            });
+            //閫夋嫨鎵�灞炵粍鎸夐挳
+            form.on('submit(hparent-BT)', function () {
+                get_checkparent();
+            });
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //#endregion
+
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Gy_ClassTimePrj/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.HStopflag;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HNumber": data.HNumber
+                                , "HItemID": data.HItemID
+                                , "HName": data.鏍哥畻鏂瑰紡鍚嶇О
+                                , "HNumber": data.鏍哥畻鏂瑰紡浠g爜
+                                , "HDeptName": data.閮ㄩ棬
+                                , "HDeptID": data.閮ㄩ棬浠g爜
+                                , "hparentName": data.缁勫悕绉�
+                                , "hparentid": data.缁勪唬鐮�
+                                , "HGroupName": data.鐝粍鍚嶇О
+                                , "HGroupID": data.鐝粍浠g爜
+                                , "HStopflag": data.HStopflag
+                                , "HRemark": data.HRemark
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                var sMainStr = JSON.stringify(data.field);
+                if (!$("#HGroupName").val()) {
+                    layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HDeptName").val()) {
+                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+               
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_ClassTimePrj/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        //console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鎵�灞炵粍鏂规硶
+            function get_checkparent() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#hparentName").val(checkStatus.data[0].HName);
+                        $("#hparentID").val(checkStatus.data[0].HItemID);
+                        //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_ClassTimePrj.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
new file mode 100644
index 0000000..8c43fb8
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
@@ -0,0 +1,310 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鏍哥畻鏂瑰紡璁剧疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鏍哥畻鏂瑰紡浠g爜</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>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+                , util = layui.util
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //娴忚
+                    case 'get_PrintReport': get_PrintReport();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+      
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�   
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        //, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '鏍哥畻鏂瑰紡浠g爜', title: '鏍哥畻鏂瑰紡浠g爜' }
+                        , { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
+                        //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍' }
+                        , { field: '缁勫悕绉�', title: '鎵�灞炵粍' }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_ClassTimePrj/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 鏍哥畻鏂瑰紡浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鏍哥畻鏂瑰紡鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏍哥畻鏂瑰紡-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏍哥畻鏂瑰紡-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_ClassTimePrj',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+            //#endregion
+    </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/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Proc.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Proc.html"
new file mode 100644
index 0000000..55b97ea
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Proc.html"
@@ -0,0 +1,456 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎵�灞炴ā鍧�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HModName" id="HModName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HModNameID" id="HModNameID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HModList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HBillTypeName" id="HBillTypeName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HBillTypeID" id="HBillTypeID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HBillTypeList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>-->
+                                         <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妯″潡鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HModNameID" lay-verify="HModNameID" id="HModNameID">
+                                            </div>
+                                        </div>
+                                         <div class="layui-col-xs4 layui-inline">
+                                             <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBillTypeID" lay-verify="HBillTypeID" id="HBillTypeID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">绂佺敤鏍囪</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀛樺偍杩囩▼鍚�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀛樺偍杩囩▼鎻忚堪</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HProcCaption" lay-verify="HProcCaption" id="HProcCaption">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                            <div class="layui-col-xs7 layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                       
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+        //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HModifyEmp").val(sessionStorage["HUserName"]);
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑�
+            //form.on('submit(Cancel)', function (data) {
+            //    if (OperationType == 1) {
+            //        Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+            //    }
+            //    else if (OperationType == 3) {
+            //        Pub_Close(closeType);
+            //    }
+            //    else {
+            //        Pub_Close(2);
+            //    }
+            //});
+          
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            ////閫夋嫨鎵�灞炴ā鍧楁寜閽�
+            //form.on('submit(HModList)', function () {
+            //    get_checkMod();
+            //});
+
+            ////閫夋嫨鍗曟嵁绫诲瀷鎸夐挳
+            //form.on('submit(HBillTypeList)', function () {
+            //    get_checkBillType();
+            //});
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Xt_DataDictionary_Proc/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                 "HItemID": data.HItemID
+                                //, "HModName": data.鎵�灞炴ā鍧楀悕绉�
+                                , "HModNameID": data.妯″潡鍚嶇О
+                                //, "HBillTypeName": data.鍗曟嵁绫诲瀷
+                                , "HBillTypeID": data.鍗曟嵁绫诲瀷
+                                , "HProcName": data.瀛樺偍杩囩▼鍚�
+                                , "HProcCaption": data.瀛樺偍杩囩▼鎻忚堪
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
+                                , "HMakeEmp": data.鍒跺崟浜�
+                                , "HModifyEmp": data.淇敼浜�
+                                , "HModifyTime": data.淇敼鏃堕棿
+                                , "HMakeTime": data.鍒跺崟鏃堕棿
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function (data) {
+                get_Exit();
+            });
+            //閫�鍑�
+            function get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
+            ////閫�鍑烘寜閽�
+            //form.on('submit(Exit)', function () {
+            //    Pub_Close(1);
+            //})
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //$("#HUseOrgID").val(sessionStorage["OrganizationID"]);
+                var sMainStr = JSON.stringify(data.field);
+                //if (!$("#HNumber").val()) {
+                //    layer.msg("璇疯緭鍏ラ儴闂ㄤ唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+               
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Xt_DataDictionary_Proc/AddBill1", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            ////#region 閫夋嫨鎵�灞炴ā鍧楁柟娉�
+            //function get_checkMod() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鎵�灞炴ā鍧�'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+            //            $("#HProcID").val(checkStatus.data[0].HItemID);
+            //            $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
+
+            ////#region 閫夋嫨鍗曟嵁绫诲瀷鏂规硶
+            //function get_checkBillType() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鍗曟嵁绫诲瀷'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../PublicPage/DeptInformation.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HDeptName").val(checkStatus.data[0].HName);
+            //            $("#HDeptID").val(checkStatus.data[0].HItemID);
+            //            $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
+
+           
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Xt_DataDictionary_Proc.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_ProcList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_ProcList.html"
new file mode 100644
index 0000000..6963477
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_ProcList.html"
@@ -0,0 +1,344 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鏁版嵁瀛楀吀(瀛樺偍杩囩▼)缁存姢</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">妯″潡鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HModNameID" id="HModNameID">
+                                    </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="HBillTypeID" id="HBillTypeID">
+                                    </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="HProcName" id="HProcName">
+                                    </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="HProcCaption" id="HProcCaption">
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).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
+            var sWhere = "";
+            var option = [];
+
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //娴忚
+                    case 'get_PrintReport': get_PrintReport();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '妯″潡鍚嶇О', title: '妯″潡鍚嶇О' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        , { field: '瀛樺偍杩囩▼鍚�', title: '瀛樺偍杩囩▼鍚�' }
+                        , { field: '瀛樺偍杩囩▼鎻忚堪', title: '瀛樺偍杩囩▼鎻忚堪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_DataDictionary_Proc/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                }); 
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏁版嵁瀛楀吀(瀛樺偍杩囩▼)-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 娴忚
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏁版嵁瀛楀吀(瀛樺偍杩囩▼)-娴忚'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹祻瑙堬紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    var ajaxLoad = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + 'DeltetXt_DataDictionary_Proc',
+                        type: "GET",
+                        data: { "HItemID": ItemID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 });
+                                get_Display(sWhere);
+                                layer.close(ajaxLoad);
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HModNameID = $("#HModNameID").val();
+                var HViewName = $("#HProcName").val();
+                var HViewCaption = $("#HProcCaption").val();
+                var HBillTypeID = $("#HBillTypeID").val();
+                if (HModNameID) {
+                    sWhere += " and 妯″潡鍚嶇О like '%" + HModNameID + "%'";
+                }
+                if (HViewName) {
+                    sWhere += " and 瀛樺偍杩囩▼鍚� like '%" + HViewName + "%'";
+                }
+                if (HViewCaption) {
+                    sWhere += " and 瀛樺偍杩囩▼鎻忚堪 like '%" + HViewCaption + "%'";
+                }
+                if (HBillTypeID) {
+                    sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillTypeID + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HModNameID").val("");
+                $("#HProcName").val("");
+                $("#HProcCaption").val("");
+                $("#HBillTypeID").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏁版嵁瀛楀吀(瀛樺偍杩囩▼)-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+        //#endregion
+            
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Table.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Table.html"
index 70763ba..9382e79 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Table.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_Table.html"
@@ -59,8 +59,8 @@
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鎵�灞炴ā鍧�</label>
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妯″潡鍚嶇О</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HModName" id="HModName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HModNameID" id="HModNameID" class="layui-input" value="" style="float:left;width:150px;">
@@ -68,8 +68,20 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                         <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妯″潡鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HModNameID" lay-verify="HModNameID" id="HModNameID">
+                                            </div>
+                                        </div>
+                                         <div class="layui-col-xs4 layui-inline">
+                                             <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBillTypeID" lay-verify="HBillTypeID" id="HBillTypeID">
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HBillTypeName" id="HBillTypeName" class="layui-input" value="" style="float:left;width:150px;">
@@ -78,7 +90,7 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鏁版嵁绫诲瀷</label>
                                             <div class="layui-input-inline">
@@ -211,6 +223,10 @@
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
+            $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            $("#HModifyTime").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HModifyEmp").val(sessionStorage["HUserName"]);
             if (typeof (params[params[0]]) == "undefined") {
                 var OperationType = 1;//鎿嶄綔绫诲瀷
             } else {
@@ -220,13 +236,11 @@
             }
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
-                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HMakeEmp").val(sessionStorage["HUserName"]);
-                $("#HModifyTime").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HModifyEmp").val(sessionStorage["HUserName"]);
+          
                 $("#HItemID").val(0);
             }
             else if (OperationType == 3) {//缂栬緫
+           
                 $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
@@ -247,24 +261,42 @@
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
+            form.on('submit(Cancel)', function (data) {
+                get_Exit();
+            });
+              //閫�鍑�
+            function get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
+            ////閫�鍑烘寜閽�
+            //form.on('submit(Cancel)', function () {
+            //    Pub_Close(1);
+            //})
 
             //鏄惁绂佺敤鎸夐挳
             form.on('checkbox(checkboxHStopflag)', function (data) {
                 $("#HStopflag").val(data.elem.checked);
             });
 
-            //閫夋嫨鎵�灞炴ā鍧楁寜閽�
-            form.on('submit(HModList)', function () {
-                get_checkMod();
-            });
+            ////閫夋嫨鎵�灞炴ā鍧楁寜閽�
+            //form.on('submit(HModList)', function () {
+            //    get_checkMod();
+            //});
 
-            //閫夋嫨鍗曟嵁绫诲瀷鎸夐挳
-            form.on('submit(HBillTypeList)', function () {
-                get_checkBillType();
-            });
+            ////閫夋嫨鍗曟嵁绫诲瀷鎸夐挳
+            //form.on('submit(HBillTypeList)', function () {
+            //    get_checkBillType();
+            //});
 
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
@@ -306,10 +338,10 @@
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                  "HItemID": data.HItemID
-                                , "HModName": data.鎵�灞炴ā鍧楀悕绉�
-                                , "HModNameID": data.鎵�灞炴ā鍧桰D
-                                , "HBillTypeName": data.鍗曟嵁绫诲瀷
-                                , "HBillTypeID": data.鍗曟嵁绫诲瀷ID
+                                //, "HModName": data.妯″潡鍚嶇О
+                                , "HModNameID": data.妯″潡鍚嶇О
+                                //, "HBillTypeName": data.鍗曟嵁绫诲瀷
+                                , "HBillTypeID": data.鍗曟嵁绫诲瀷
                                 , "HDataType": data.鏁版嵁绫诲瀷
                                 , "HTableName": data.鏁版嵁琛ㄥ悕
                                 , "HTableCaption": data.琛ㄦ爣绛�
@@ -319,8 +351,8 @@
                                 , "HRemark": data.澶囨敞
                                 , "HMakeEmp": data.鍒跺崟浜�
                                 , "HModifyEmp": data.淇敼浜�
-                                , "HModifyTime": data.淇敼鏃ユ湡
-                                , "HMakeTime": data.鍒跺崟鏃ユ湡
+                                , "HModifyTime": data.淇敼鏃堕棿
+                                , "HMakeTime": data.鍒跺崟鏃堕棿
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -370,57 +402,57 @@
             }
             //#endregion
 
-            //#region 閫夋嫨鎵�灞炴ā鍧楁柟娉�
-            function get_checkMod() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鎵�灞炴ā鍧�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
-                        $("#HProcID").val(checkStatus.data[0].HItemID);
-                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
+            ////#region 閫夋嫨鎵�灞炴ā鍧楁柟娉�
+            //function get_checkMod() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鎵�灞炴ā鍧�'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+            //            $("#HProcID").val(checkStatus.data[0].HItemID);
+            //            $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
 
-            //#region 閫夋嫨鍗曟嵁绫诲瀷鏂规硶
-            function get_checkBillType() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鍗曟嵁绫诲瀷'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
+            ////#region 閫夋嫨鍗曟嵁绫诲瀷鏂规硶
+            //function get_checkBillType() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鍗曟嵁绫诲瀷'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../PublicPage/DeptInformation.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HDeptName").val(checkStatus.data[0].HName);
+            //            $("#HDeptID").val(checkStatus.data[0].HItemID);
+            //            $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
 
            
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_TableList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_TableList.html"
index c99683d..2e59d2d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_TableList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_TableList.html"
@@ -165,7 +165,7 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                        , { field: '妯″潡鍚嶇О', title: '妯″潡鍚嶇О' }
+                        , { field: '妯″潡鍚嶇О', title: '妯″潡鍚嶇О',width: 130 }
                         , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
                         , { field: '鏁版嵁琛ㄥ悕', title: '鏁版嵁琛ㄥ悕' }
                         , { field: '琛ㄦ爣绛�', title: '琛ㄦ爣绛�' }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_View.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_View.html"
index 5cd629b..6a7bc97 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_View.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\225\260\346\215\256\345\255\227\345\205\270/Xt_DataDictionary_View.html"
@@ -59,7 +59,7 @@
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
+                                        <!--<div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鎵�灞炴ā鍧�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HModName" id="HModName" class="layui-input" value="" style="float:left;width:150px;">
@@ -77,6 +77,18 @@
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HBillTypeList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
+                                            </div>
+                                        </div>-->
+                                         <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妯″潡鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HModNameID" lay-verify="HModNameID" id="HModNameID">
+                                            </div>
+                                        </div>
+                                         <div class="layui-col-xs4 layui-inline">
+                                             <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBillTypeID" lay-verify="HBillTypeID" id="HBillTypeID">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -221,24 +233,38 @@
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
+            form.on('submit(Cancel)', function (data) {
+                get_Exit();
+            });
+            //閫�鍑�
+            function get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
 
             //鏄惁绂佺敤鎸夐挳
             form.on('checkbox(checkboxHStopflag)', function (data) {
                 $("#HStopflag").val(data.elem.checked);
             });
 
-            //閫夋嫨鎵�灞炴ā鍧楁寜閽�
-            form.on('submit(HModList)', function () {
-                get_checkMod();
-            });
+            ////閫夋嫨鎵�灞炴ā鍧楁寜閽�
+            //form.on('submit(HModList)', function () {
+            //    get_checkMod();
+            //});
 
-            //閫夋嫨鍗曟嵁绫诲瀷鎸夐挳
-            form.on('submit(HBillTypeList)', function () {
-                get_checkBillType();
-            });
+            ////閫夋嫨鍗曟嵁绫诲瀷鎸夐挳
+            //form.on('submit(HBillTypeList)', function () {
+            //    get_checkBillType();
+            //});
 
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
@@ -280,18 +306,18 @@
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                  "HItemID": data.HItemID
-                                , "HModName": data.鎵�灞炴ā鍧楀悕绉�
-                                , "HModNameID": data.鎵�灞炴ā鍧桰D
-                                , "HBillTypeName": data.鍗曟嵁绫诲瀷
-                                , "HBillTypeID": data.鍗曟嵁绫诲瀷ID
+                                //, "HModName": data.鎵�灞炴ā鍧楀悕绉�
+                                , "HModNameID": data.妯″潡鍚嶇О
+                                //, "HBillTypeName": data.鍗曟嵁绫诲瀷
+                                , "HBillTypeID": data.鍗曟嵁绫诲瀷
                                 , "HViewName": data.瑙嗗浘鍚�
                                 , "HViewCaption": data.瑙嗗浘鎻忚堪
                                 , "HStopflag": data.绂佺敤鏍囪
                                 , "HRemark": data.澶囨敞
                                 , "HMakeEmp": data.鍒跺崟浜�
                                 , "HModifyEmp": data.淇敼浜�
-                                , "HModifyTime": data.淇敼鏃ユ湡
-                                , "HMakeTime": data.鍒跺崟鏃ユ湡
+                                , "HModifyTime": data.淇敼鏃堕棿
+                                , "HMakeTime": data.鍒跺崟鏃堕棿
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -341,57 +367,57 @@
             }
             //#endregion
 
-            //#region 閫夋嫨鎵�灞炴ā鍧楁柟娉�
-            function get_checkMod() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鎵�灞炴ā鍧�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
-                        $("#HProcID").val(checkStatus.data[0].HItemID);
-                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
+            ////#region 閫夋嫨鎵�灞炴ā鍧楁柟娉�
+            //function get_checkMod() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鎵�灞炴ā鍧�'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+            //            $("#HProcID").val(checkStatus.data[0].HItemID);
+            //            $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
 
-            //#region 閫夋嫨鍗曟嵁绫诲瀷鏂规硶
-            function get_checkBillType() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鍗曟嵁绫诲瀷'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
+            ////#region 閫夋嫨鍗曟嵁绫诲瀷鏂规硶
+            //function get_checkBillType() {
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '鍗曟嵁绫诲瀷'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../PublicPage/DeptInformation.html', 'yes']
+            //        , btn: ['纭畾', '鍙栨秷']
+            //        , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+            //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+            //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+            //            if (checkStatus.data.length === 0) {
+            //                return layer.msg('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            $("#HDeptName").val(checkStatus.data[0].HName);
+            //            $("#HDeptID").val(checkStatus.data[0].HItemID);
+            //            $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            ////#endregion
 
            
 

--
Gitblit v1.9.1