From 07fbf4b6d67113b015ee755b1cd505d91fd6d6a8 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 30 一月 2026 10:47:00 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html    |   78 +
 WebTM/views/PublicPage/MaterialInfo.html                       |   20 
 WebTM/views/物流管理/运输定位/Pay_WayBillPaymentBillEdit.html          |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html            |   14 
 WebTM/views/基础资料/公用基础资料/Gy_CostItemAverageType.html            | 1084 ++++++++++++++++
 WebTM/views/物流管理/运输定位/Add_Edit_WL_YayBill.html                 |   10 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html         |   16 
 WebTM/views/成本管理/费用单引入/CB_ItemMoneyBillImport.html             |  373 +++++
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html           |   72 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html          |   60 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html           |  154 +
 WebTM/layuiadmin/SetColumn.js                                  |   17 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemAverageType.html   |  405 ++++++
 WebTM/views/基础资料/公用基础资料/Gy_CostItemFixRate.html                | 1083 ++++++++++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemFixRate.html       |  393 ++++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html        |   14 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html      |   56 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html |   10 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                    |   32 
 WebTM/WebTM.csproj                                             |    5 
 20 files changed, 3,802 insertions(+), 96 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 315bb7c..5f93e63 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -478,6 +478,10 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItemFixRate.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItemFixRate.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItemAverageType.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItemAverageType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
@@ -645,6 +649,7 @@
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_SellOutCompareToProductReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeMaterEntryReport.html" />
+    <Content Include="views\鎴愭湰绠$悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
     <Content Include="views\鏉$爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
     <Content Include="views\妗堜緥浠g爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
     <Content Include="views\妗堜緥浠g爜\鍗庤繙\HY_HistogramReport.html" />
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 006e9c6..e40d66b 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -852,6 +852,23 @@
         .forEach(pos => {
             result = result.slice(0, pos) + '(' + result.slice(pos);
         });
+    let finalLeftCount = 0;
+    let finalRightCount = 0;
+
+    // 璁$畻鏈�缁堝瓧绗︿覆涓殑鎷彿鏁伴噺
+    for (let i = 0; i < result.length; i++) {
+        if (result[i] === '(') {
+            finalLeftCount++;
+        } else if (result[i] === ')') {
+            finalRightCount++;
+        }
+    }
+
+    // 濡傛灉宸︽嫭鍙锋暟閲忓ぇ浜庡彸鎷彿鏁伴噺锛屽湪鏈�鍚庤ˉ鍏呯己澶辩殑鍙虫嫭鍙�
+    if (finalLeftCount > finalRightCount) {
+        const missingRightParentheses = finalLeftCount - finalRightCount;
+        result += ')'.repeat(missingRightParentheses);
+    }
 
     return result;
 }
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 8feafc5..4fc18a9 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -47,6 +47,18 @@
                                                         <input type="text" class="layui-input" name="HName" id="HName">
                                                     </div>
                                                 </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠撳簱浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HWHNumber" id="HWHNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠撳簱鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HWHName" id="HWHName">
+                                                    </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>
@@ -169,12 +181,20 @@
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HWHNumber = $("#HWHNumber").val();
+                var HWHName = $("#HWHName").val()
                 if (HNumber) {
                     sWhere += " and 鐗╂枡浠g爜 = '" + HNumber + "'";
                 }
                 if (HName) {
                     sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
                 }
+                if (HWHNumber) {
+                    sWhere += " and 浠撳簱浠g爜 = '" + HWHNumber + "'";
+                }
+                if (HWHName) {
+                    sWhere += " and 浠撳簱 = '" + HWHName + "'";
+                }
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/MaterialList',
                     type: "GET",
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_CostItemAverageType.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_CostItemAverageType.html"
new file mode 100644
index 0000000..08b66fe
--- /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_CostItemAverageType.html"
@@ -0,0 +1,405 @@
+锘�<!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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="padding-top: 10px;">
+                            <div class="layui-tab layui-tab-brief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <h1 style="text-align:center;"><b>鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜�</b></h1>
+                                        <div class="layui-tab-content">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                            <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鎴愭湰鍒嗛厤绫诲瀷锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HAverageTypeID" lay-verify="HAverageTypeID" id="HAverageTypeID" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鎴愭湰椤圭洰锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HCostItemID" id="HCostItemID" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鏈熸湯鍦ㄥ埗绯绘暟锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HFixRate" id="HFixRate" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                            <option value="鏈娴�" selected>鏈娴�</option>
+                                                            <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                            <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">绂佺敤鏍囧織:</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline" style="margin-left: 20px;">
+                                                    <label class="layui-form-label" style="width: 120px">鏍哥畻鍦ㄥ埗鍝�:</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HWIPFlag" id="HWIPFlag" lay-skin="primary" title="" value="">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-col-xs11">
+                                                    <label class="layui-form-label"> 瀵瑰簲鏂规硶锛�</label>
+                                                    <div class="layui-input-block">
+                                                        <input class="layui-input" name="HProcNam" id="HProcNam" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-col-xs11">
+                                                    <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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" 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="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//澶嶅埗
+                set_AddFNew();
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                set_EditForm(linterid);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var isEndCheck1 = document.getElementById("HWIPFlag").checked;
+                isEndCheck1 == true ? data.field.HWIPFlag = 'true' : data.field.HWIPFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Gy_CostItemAverageType/SaveGy_CostItemAverageType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HCREATEORGID").attr("disabled", true);
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+               
+                layui.form.render('checkbox');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HCostItemID").val("0");
+                $("#HFixRate ").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_CostItemAverageType/Gety_CostItemFixRate",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(OperationType == 2 ? "0" : data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜);//浠g爜
+                            $("#HName").val(data.鎴愭湰椤圭洰鍒嗛厤鏍囧噯鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HCostItemID").val(data.鎴愭湰椤圭洰鍐呯爜);
+                            $("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
+                            $("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
+                            $("#HFixRate").val(data.鏈熸湯鍦ㄥ埗绯绘暟);
+                            $("#HRemark").val(data.澶囨敞);
+                            $("input[name='HWIPFlag']").attr("checked", data.鏄惁鏍哥畻鍦ㄥ埗鍝� == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            $("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃堕棿 == null ? "" : Format(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+                            $("#HCREATEORGID").append(Organization);
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostItemFixRate.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_CostItemFixRate.html"
new file mode 100644
index 0000000..816170a
--- /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_CostItemFixRate.html"
@@ -0,0 +1,393 @@
+锘�<!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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="padding-top: 10px;">
+                            <div class="layui-tab layui-tab-brief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <h1 style="text-align:center;"><b>鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜�</b></h1>
+                                        <div class="layui-tab-content">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                            <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">瀵瑰簲鏂规硶锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鎴愭湰椤圭洰锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HCostItemID" id="HCostItemID" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鍥哄畾鍒嗛厤鐜囷細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HFixRate" id="HFixRate" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                            <option value="鏈娴�" selected>鏈娴�</option>
+                                                            <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                            <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-col-xs11">
+                                                    <label class="layui-form-label"> 鎴愭湰椤圭洰璁$畻姒傝堪锛�</label>
+                                                    <div class="layui-input-block">
+                                                        <input class="layui-input" name="HCountRemark" id="HCountRemark" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-form-item">
+                                                <div class="layui-col-xs11">
+                                                    <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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" 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="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//澶嶅埗
+                set_AddFNew();
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                set_EditForm(linterid);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "Gy_CostItemFixRate/SaveGy_CostItemFixRate", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HCREATEORGID").attr("disabled", true);
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HCostItemID").val("0");
+                $("#HFixRate ").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_CostItemFixRate/Gety_CostItemFixRate",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(OperationType == 2 ? "0" : data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�);//浠g爜
+                            $("#HName").val(data.鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囧悕绉�);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HCostItemID").val(data.鎴愭湰椤圭洰);//澶囨敞
+                            $("#HFixRate").val(data.鍥哄畾鍒嗛厤鐜�);//澶囨敞
+                            $("#HCountRemark ").val(data.鎴愭湰椤圭洰璁$畻姒傝堪);//澶囨敞
+                            $("#HProcName").val(data.瀵瑰簲鏂规硶);//澶囨敞
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            $("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃堕棿 == null ? "" : Format(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+                            $("#HCREATEORGID").append(Organization);
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CostItemAverageType.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_CostItemAverageType.html"
new file mode 100644
index 0000000..1d0e9a7
--- /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_CostItemAverageType.html"
@@ -0,0 +1,1084 @@
+锘�
+<!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/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = [];
+            var HModName = "Gy_CostItemAverageType";
+            var HBillType = "Gy_CostItemAverageType";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮� ", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HUSEORGID", "HCREATEORGID"];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鎴愭湰椤圭洰鍒嗛厤鏍囧噯鍒楄〃缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(1);
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜') {
+                    var hID = data.HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鎴愭湰椤圭洰鍒嗛厤鏍囧噯'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemAverageType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetProjectMoneyValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                btnrowDouble(obj);
+                // parent.layer.close(index);
+            });
+            //#endregion
+
+
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetProjectMoneyValue(data);
+                parent.layer.close(index);
+            }
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+
+                    url: GetWEBURL() + '/Gy_CostItemAverageType/Gy_CostItemAverageTypeList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name == '鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery(number) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HOrgID = $("#HOrgID").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
+                }
+                if (HNumber) {
+                    sWhere += " and 鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鎴愭湰椤圭洰鍒嗛厤鏍囧噯鍚嶇О like '%" + HName + "%'";
+                }
+                addSWhereByOpenType();
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemAverageType.html?OperationType=1&linterid=0&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //#region 澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嶈壇鐜拌薄-澶嶅埗'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemAverageType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , cancel: function () {
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    if (!data[0].瀹℃牳浜� && !data[0].绂佺敤浜�) {
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '缂栬緫鎴愭湰椤圭洰鍒嗛厤鏍囧噯浠g爜'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemAverageType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                    }
+                    else {
+                        layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_CostItemAverageType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Gy_CostItemAverageType/AuditGy_CostItemAverageType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Gy_CostItemAverageType/StopGy_CostItemAverageType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = get_UrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+                if (typeof (openType) != "undefined") {
+                    sWhere += " and ISNULL(瀹℃牳浜�,'')  != '' and 绂佺敤鏍囧織 !='鏄�'";
+                    return true;
+                }
+                return false;
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+
+
+            //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CostItemFixRate.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_CostItemFixRate.html"
new file mode 100644
index 0000000..66833bd
--- /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_CostItemFixRate.html"
@@ -0,0 +1,1083 @@
+锘�
+<!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/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+ 
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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 = [];
+            var HModName = "Gy_ItemMoney";
+            var HBillType = "Gy_ItemMoney";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮� ", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HUSEORGID", "HCREATEORGID"];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囧垪琛ㄧ淮鎶�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(1);
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�') {
+                    var hID = data.HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemFixRate.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetProjectMoneyValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                btnrowDouble(obj);
+                // parent.layer.close(index);
+            });
+            //#endregion
+
+
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetProjectMoneyValue(data);
+                parent.layer.close(index);
+            }
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+
+                    url: GetWEBURL() + '/Gy_CostItemFixRate/Gy_CostItemFixRateList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name == '鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery(number) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HOrgID = $("#HOrgID").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
+                }
+                if (HNumber) {
+                    sWhere += " and 鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮� like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囧悕绉� like '%" + HName + "%'";
+                }
+                addSWhereByOpenType();
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemFixRate.html?OperationType=1&linterid=0&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //#region 澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嶈壇鐜拌薄-澶嶅埗'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemFixRate.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , cancel: function () {
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    if (!data[0].瀹℃牳浜� && !data[0].绂佺敤浜�) {
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '缂栬緫鎴愭湰椤圭洰鍥哄畾鍒嗛厤鐜囦唬鐮�'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemFixRate.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                    }
+                    else {
+                        layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_CostItemFixRate", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Gy_CostItemFixRate/AuditGy_CostItemFixRate", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_CostItemFixRate/StopGy_CostItemFixRate", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = get_UrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+                if (typeof (openType) != "undefined") {
+                    sWhere += " and ISNULL(瀹℃牳浜�,'')  != '' and 绂佺敤鏍囧織 !='鏄�'";
+                    return true;
+                }
+                return false;
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+
+
+            //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html"
new file mode 100644
index 0000000..756ec8e
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html"
@@ -0,0 +1,373 @@
+锘�<!DOCTYPE html>
+<html>
+<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>
+
+    <style type="text/css">
+        .loader {
+            border: 8px solid #f3f3f3; /* Light grey */
+            border-top: 8px solid #3498db; /* Blue */
+            border-radius: 50%;
+            width: 50px;
+            height: 50px;
+            animation: spin 2s linear infinite;
+        }
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</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">
+                            <h1 style="text-align: center; padding: 30px 0;"><b>璐圭敤寮曞叆</b></h1>
+                            <div class="layui-colla-item" style="padding-top:20px;">
+                                <!--<div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID" disabled>-->
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        <!--</select>
+                                    </div>
+                                </div>-->
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">寮曞叆绫诲瀷</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        
+                                        <select name="HType" id="HType" lay-verify="HType">
+                                            <option value="1" selected="selected">涓绘潗/杈呮潗鎴愭湰寮曞叆</option>
+                                            <option value="2">璐圭敤鎴愭湰寮曞叆</option>
+                                            
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">骞�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <option value="2023">2023骞�</option>
+                                            <option value="2024">2024骞�</option>
+                                            <option value="2025">2025骞�</option>
+                                            <option value="2026" selected="selected">2026骞�</option>
+                                            <option value="2027">2027骞�</option>
+                                            <option value="2028">2028骞�</option>
+                                            <option value="2029">2029骞�</option>
+                                            <option value="2030">2030骞�</option>
+                                            <option value="2031">2031骞�</option>
+                                            <option value="2032">2032骞�</option>
+                                            <option value="2033">2033骞�</option>
+                                            <option value="2034">2034骞�</option>
+                                            <option value="2035">2035骞�</option>
+                                            <option value="2036">2036骞�</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鏈�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
+                                            <option value="1">1鏈�</option>
+                                            <option value="2">2鏈�</option>
+                                            <option value="3">3鏈�</option>
+                                            <option value="4">4鏈�</option>
+                                            <option value="5">5鏈�</option>
+                                            <option value="6">6鏈�</option>
+                                            <option value="7">7鏈�</option>
+                                            <option value="8">8鏈�</option>
+                                            <option value="9">9鏈�</option>
+                                            <option value="10">10鏈�</option>
+                                            <option value="11">11鏈�</option>
+                                            <option value="12">12鏈�</option>
+                                        </select>
+                                        
+                                    </div>
+                                </div>
+                                <!--<div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>-->
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬪紩鍏�</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
+                            </div>
+                            <div class="layui-colla-item" style="height:600px;margin-top:20px;">
+                                <font size="5" color="blue" id="HRemark"></font>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript">
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , tableSelect = layui.tableSelect;
+            var HModName = "CB_ItemMoneyBillImport";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                // 鑾峰彇褰撳墠鏃ユ湡
+                var currentDate = new Date();
+                var currentYear = currentDate.getFullYear();
+                var currentMonth = currentDate.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ+1
+
+                // 璁剧疆榛樿閫変腑褰撳墠骞翠唤
+                var yearSelect = document.getElementById('HYear');
+                if (yearSelect) {
+                    yearSelect.value = currentYear;
+                }
+
+                // 璁剧疆榛樿閫変腑褰撳墠鏈堜唤
+                var monthSelect = document.getElementById('HMonth');
+                if (monthSelect) {
+                    monthSelect.value = currentMonth;
+                }
+                //閮ㄩ棬杈撳叆妗�
+                tableSelect.render({
+                    elem: '#HWorkShopIDName',//杈撳叆妗哾om閫夋嫨
+                    searchKey: '閮ㄩ棬鍚嶇О,HItemID',//鏌ヨ鐨勫垪鍚�
+                    sWhere: " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ",//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+                    ajaxSelect: function (sWhere) {
+                        var data = '';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Department/list',
+                            type: "GET",
+                            data: { "sWhere": sWhere, "user": HMaker, "Organization": sessionStorage["Organization"] },
+                            async: false,
+                            success: function (data1) {
+                                if (data1.count == 1) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        //url: GetWEBURL() + 'Gy_Supplier/page',
+                        //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝g‘鐐瑰嚮
+                            { field: 'HItemID', title: 'HItemID' },
+                            { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' },
+                        ]],
+                        page: true,
+                        limit: 5,
+                        limits: [5]
+                    },
+                    done: function (elem, data) {
+                        if (data != []) {
+                            $("#HWorkShopIDName").val(data.data[0]['閮ㄩ棬鍚嶇О']);
+                            $("#HWorkShopID").val(data.data[0]['HItemID']);
+                        }
+
+                    }
+                })
+                Organ();
+            }
+            //鐢熶骇杞﹂棿
+            form.on('submit(btnHWorkShopID)', function (data) {
+                btnHWorkShopID();
+            });
+
+            //#endregion
+
+            //#region 寮�濮嬭垂鐢ㄥ紩鍏�
+            form.on('submit(btn_Import)', function (data) {
+                if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
+                    var index = layer.open({
+                        type: 1, // page 灞傜被鍨�
+                        area: ['20%', '20%'],
+                        shade: 0.6, // 閬僵閫忔槑搴�
+                        shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+                        maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+                        anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+                        content: '<div style="padding: 12px;">姝e湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
+                    });
+                    setTimeout(function () {
+                        set_Calculate(data);
+                        layer.close(index);
+                        layer.close(index1);
+                    }, 1000)
+                }
+                
+            });
+
+            //鏉冮檺鍒ゅ畾
+            function set_ModCheck(ModRightNameCheck) {
+                var Permission = false;
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            Permission = true;
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return Permission;
+            }
+
+            function set_Calculate() {
+                //var HWorkShopID = $("#HWorkShopID").val();
+                //if (HWorkShopID == 0) {
+                //    layer.close(ajaxLoad);
+                //    layer.msg("璇烽�夋嫨閮ㄩ棬");
+                //    return
+                //}
+                var HMonth = $("#HMonth").val();
+                var HYear = $("#HYear").val();
+                var Type = $("#HType").val();
+                //娆犳枡杩愮畻
+                
+                var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
+                var startTime = new Date().getTime();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sql },
+                    success: function (data1) {
+                        // 璁$畻璇锋眰鑺辫垂鐨勬椂闂�
+                        var endTime = new Date().getTime();
+                        var executionTime = endTime - startTime; // 姣
+                        var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
+                        if (data1.count == 1) {
+                            layer.msg("瀹屾垚璐圭敤寮曞叆");
+                            // 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁$畻鏃堕棿锛�
+                            setTimeout(function () {
+                                layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
+                                layer.close(ajaxLoad);
+                            }, 1000);
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HProdORGID").append(Organization);
+                            $("#HProdORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btn_Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
+            //#region 閫夋嫨鐢熶骇杞﹂棿
+            function btnHWorkShopID() {
+                var HOrgName = $(".layui-form-select input").val();
+                layer.open({
+                    type: 2 //绫诲瀷
+                    , skin: 'layui-layer-rim'//鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                        $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+                        /*get_WriteConfigFile();*/
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+        });
+        function GetHDeptNameValue(obj)  //杩斿洖閲囪喘閮ㄩ棬
+        {
+            $("#HWorkShopID").val(obj[0].HItemID);//杞﹂棿id
+            $("#HWorkShopIDName").val(obj[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+        }
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index af94716..068bdf3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -22,6 +22,18 @@
             margin-left: 123px;
             min-height: 36px;
         }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 
@@ -272,6 +284,13 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <script type="text/html" id="HStdDotCheckResult">
+        <select name="HStdDotCheckResult" value="OK" lay-filter="HStdDotCheckResult" id="HStdDotCheckResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
+    </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>
@@ -358,7 +377,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -501,6 +520,24 @@
                     //}
                 }
             });
+
+            //琛岄�夋嫨澶勭悊锛堥粯璁ょ偣妫�缁撴灉锛�
+            form.on('select(HStdDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult']);
+                }
+                form.render('select');
+            });
+
             //#endregion
 
 
@@ -533,6 +570,7 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemNumber', title: '鐐规椤圭洰浠g爜', edit: 'text', event: 'HDotCheckItemNumber' }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰' }
+                    , { field: 'HStdDotCheckResult', title: "鐐规缁撴灉", templet: '#HStdDotCheckResult', event: 'HStdDotCheckResult' }
                     , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', event: 'HDotCheckItemClassName' }
                     , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
@@ -568,7 +606,7 @@
                 $("#check-btn").addClass('layui-btn-disabled').attr('disabled', true)
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -666,11 +704,34 @@
                             var subarr = [];
 
                             for (var i = 0; i < data.length; i++) {
-                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItemNumber": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                                subarr.push({
+                                    "HDotCheckItemID": data[i].鐐规椤圭洰ID,
+                                    "HDotCheckItemNumber": data[i].鐐规椤圭洰浠g爜,
+                                    "HDotCheckItem": data[i].鐐规椤圭洰,
+                                    "HDotCheckPart": data[i].鐐规閮ㄤ綅,
+                                    "HClaim": data[i].鍏蜂綋瑕佹眰,
+                                    "HManagerID": data[i].璐熻矗浜篒D,
+                                    "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+                                    "HManagerName": data[i].璐熻矗浜哄悕绉�,
+                                    "HRemark": data[i].瀛愬娉�,
+                                    "HDotCheckItemClassID": data[i].HDotCheckItemClassID,
+                                    "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
+                                    "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID,
+                                    "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О,
+                                    "HStdDotCheckResult": data[i]["鐐规缁撴灉"] || "OK"
+                                });
+
                             }
 
                             option.data = subarr;
                             table.render(option);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                                $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                            }
+                            form.render('select');
+
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -728,6 +789,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(buttonArr[i - 1]['HStdDotCheckResult'])
+                }
+                form.render('select');
             }
 
             //澶嶅埗涓�琛�
@@ -745,6 +811,12 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                        $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                    }
+                    form.render('select');
                 }
             }
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
index 0c8138a..3714f14 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -1791,6 +1791,12 @@
                                             HUnitID: OptionData.HUnitID,
                                             HUnitNumber: OptionData.璁¢噺鍗曚綅浠g爜,
                                             HUnitName: OptionData.璁¢噺鍗曚綅,
+                                            HWHID: OptionData.HWhID ? OptionData.HWhID : 0,
+                                            HWHName: OptionData.榛樿浠撳簱,
+                                            HWHNumber: OptionData.榛樿浠撳簱浠g爜,
+                                            HSPID: OptionData.HSPID ? OptionData.HSPID : 0,
+                                            HSPName: OptionData.榛樿浠撲綅,
+                                            HSPNumber: OptionData.榛樿浠撲綅浠g爜,
                                             HDesignLife: 0,  //璁捐瀵垮懡
                                             HLeaveLife: 0,   //鍓╀綑瀵垮懡
                                             HQty: 1,         //瀹炴敹鏁伴噺
@@ -2194,10 +2200,10 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
-                    if (sSubStr[i].HUnitID == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
+                    //if (sSubStr[i].HUnitID == "") {
+                    //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return Result = false;
+                    //}
                     if (sSubStr[i].HQty == "0") {
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index c03c1bd..bb16a2d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -120,7 +120,7 @@
                                                 <input type="text" name="HWHName" id="HWHName" readonly
                                                     class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
-                                                    value="" style="float:left;width:150px;">
+                                                    value="0" style="float:left;width:150px;">
                                                 <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input"
                                                     value="" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn"
@@ -139,7 +139,7 @@
                                                 <input type="text" name="HSecManagerName" id="HSecManagerName" readonly
                                                     class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HSecManagerID" id="HSecManagerID"
-                                                    class="layui-input" value="" style="float:left;width:150px;">
+                                                    class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn"
                                                     lay-filter="HSecManagerList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -154,7 +154,7 @@
                                                 <input type="text" name="HKeeperName" id="HKeeperName" readonly
                                                     class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input"
-                                                    value="" style="float:left;width:150px;">
+                                                    value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn"
                                                     lay-filter="HKeeperList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -169,7 +169,7 @@
                                                 <input type="text" name="HDeptName" id="HDeptName" readonly
                                                     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;">
+                                                    value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn"
                                                     lay-filter="Department" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -1266,6 +1266,12 @@
                                             option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                             option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁¢噺鍗曚綅浠g爜;
                                             option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁¢噺鍗曚綅;
+                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWHID;
+                                            option.data[rowIndex + i].HWHName = checkStatus.data[i].榛樿浠撳簱;
+                                            option.data[rowIndex + i].HWHCode = checkStatus.data[i].榛樿浠撳簱浠g爜;
+                                            option.data[rowIndex + i].HSPID = checkStatus.data[i].HSPID;
+                                            option.data[rowIndex + i].HSPName = checkStatus.data[i].榛樿浠撲綅;
+                                            option.data[rowIndex + i].HSPCode = checkStatus.data[i].榛樿浠撲綅浠g爜;
                                         }
                                         table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
                                     }
@@ -1287,6 +1293,12 @@
                                             HUnitID: OptionData.HUnitID,
                                             HUnitCode: OptionData.璁¢噺鍗曚綅浠g爜,
                                             HUnitName: OptionData.璁¢噺鍗曚綅,
+                                            HWHID : OptionData.HWhID,
+                                            HWHName : OptionData.榛樿浠撳簱,
+                                            HWHCode : OptionData.榛樿浠撳簱浠g爜,
+                                            HSPID : OptionData.HSPID,
+                                            HSPName : OptionData.榛樿浠撲綅,
+                                            HSPCode : OptionData.榛樿浠撲綅浠g爜,
                                             HDesignLife: 0,  //璁捐瀵垮懡
                                             HLeaveLife: 0,   //鍓╀綑瀵垮懡
                                             HQty: 1,         //瀹炴敹鏁伴噺
@@ -1585,22 +1597,22 @@
             //闈炵┖楠岃瘉
             function AllowLoadData(sSubStr) {
                 var Result = true;
-                if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
-                    layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
-                    layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
-                    layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                    layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
+                //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+                //    layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+                //if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+                //    layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+                //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+                //    layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+                //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+                //    layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
 
                 if (typeof (sSubStr) == "undefined" || sSubStr == "") {
                     layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1613,10 +1625,10 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        if (sSubStr[i].HUnitID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return Result = false;
-                        }
+                        //if (sSubStr[i].HUnitID == "") {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
                         if (sSubStr[i].HWHID == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 6e6467f..404623f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -548,6 +548,7 @@
                             var data = result.data[0];
                             if (data[0].瀹℃牳浜� != "") {
                                 $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                                $('#btn_Audit').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             if (data[0].HSourceInterID != "0") {
                                 $("#HStockOrgID").attr("disabled", "disabled");
@@ -1791,6 +1792,12 @@
                                             HUnitID: OptionData.HUnitID,
                                             HUnitNumber: OptionData.璁¢噺鍗曚綅浠g爜,
                                             HUnitName: OptionData.璁¢噺鍗曚綅,
+                                            HWHID: OptionData.褰撳墠浠撳簱ID ? OptionData.褰撳墠浠撳簱ID : 0,
+                                            HWHName: OptionData.褰撳墠浠撳簱,
+                                            HWHNumber: OptionData.褰撳墠浠撳簱浠g爜,
+                                            HSPID: OptionData.褰撳墠浠撲綅ID ? OptionData.褰撳墠浠撲綅ID : 0,
+                                            HSPName: OptionData.褰撳墠浠撲綅,
+                                            HSPNumber: OptionData.褰撳墠浠撲綅浠g爜,
                                             HDesignLife: 0,  //璁捐瀵垮懡
                                             HLeaveLife: 0,   //鍓╀綑瀵垮懡
                                             HQty: 1,         //瀹炴敹鏁伴噺
@@ -1952,6 +1959,7 @@
                             $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
                             layer.msg(data.Message, { icon: 1 });
                             $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            $('#btn_Audit').addClass("layui-btn-disabled").attr("disabled", true);
                             layer.close(index);
                         }
                         else {
@@ -2196,10 +2204,10 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
-                    if (sSubStr[i].HUnitID == "") {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return Result = false;
-                    }
+                    //if (sSubStr[i].HUnitID == "") {
+                    //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return Result = false;
+                    //}
                     if (sSubStr[i].HQty == "0") {
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 39f596b..6945d84 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -1468,6 +1468,12 @@
                                             HUnitID: OptionData.HUnitID,
                                             HUnitCode: OptionData.璁¢噺鍗曚綅浠g爜,
                                             HUnitName: OptionData.璁¢噺鍗曚綅,
+                                            HWHID: OptionData.褰撳墠浠撳簱ID ? OptionData.褰撳墠浠撳簱ID : 0,
+                                            HWHName: OptionData.褰撳墠浠撳簱,
+                                            HWHCode: OptionData.褰撳墠浠撳簱浠g爜,
+                                            HSPID: OptionData.褰撳墠浠撲綅ID ? OptionData.褰撳墠浠撲綅ID : 0,
+                                            HSPName: OptionData.褰撳墠浠撲綅,
+                                            HSPCode: OptionData.褰撳墠浠撲綅浠g爜,
                                             HDesignLife: 0,  //璁捐瀵垮懡
                                             HLeaveLife: 0,   //鍓╀綑瀵垮懡
                                             HQty: 1,         //瀹炴敹鏁伴噺
@@ -1837,10 +1843,10 @@
             //    layer.msg("浠撳簱涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             //    return Result = false;
             //}
-            if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
-                layer.msg("鍙戣揣鍛樹笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
+            //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+            //    layer.msg("鍙戣揣鍛樹笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
             //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
             //    layer.msg("閮ㄩ棬涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             //    return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 288867f..9d62050 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -197,7 +197,7 @@
                                             <label class="layui-form-label">榛樿瑙勭▼</label>
                                             <div class="layui-input-inline">
                                                 <input type="checkbox" name="HStandard" id="HStandard"
-                                                    lay-skin="primary" value="1" title="" checked="false" >
+                                                    lay-skin="primary" value="1">
                                             </div>
                                         </div>
                                     </div>
@@ -324,14 +324,14 @@
                         <script type="text/html" id="xuhao1">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
-                        
+
                     </form>
                 </div>
             </div>
         </div>
     </div>
     <script type="text/html" id="HStdMaintainResult">
-        <select name="HStdMaintainResult" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+        <select name="HStdMaintainResult" value="OK" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
             <!--<option value="">璇烽�夋嫨</option>-->
             <option value="OK" selected>OK</option>
             <option value="NG">NG</option>
@@ -427,7 +427,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HStdMaintainResult": "OK"};
+                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HStdMaintainResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -477,15 +477,17 @@
             form.on('submit(Saver)', function (data) {
 
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
-                data.field["HStandard"] = data.field["HStandard"]?1:0
+                data.field["HStandard"] = data.field["HStandard"] ? 1 : 0
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
+                console.log(sSubStr)
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
+
                 $.ajax(
                     {
                         type: "POST",
@@ -615,16 +617,21 @@
             });
 
 
-             //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
-            form.on('select(HStdMaintainResultHandler)', function (data) {
+            //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
+            form.on('select(HStdMaintainResult)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
                 var elem = data.othis.parents('tr');
                 var dataindex = elem.attr("data-index");
-                $.each(option2.data, function (index, value) {
+                $.each(option.data, function (index, value) {
                     if (value.LAY_TABLE_INDEX == dataindex) {
                         value.HStdMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult']);
+                }
+                form.render('select');
             });
 
             //#endregion
@@ -656,7 +663,7 @@
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
-                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResultHandler' }
+                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResult' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
                     , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
@@ -757,7 +764,6 @@
                     success: function (result) {
                         //console.log(result.code)
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            //console.log(result)
                             var data = result.data.h_v_Sc_MouldMaintainRuleBill_Edit[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": OperationType == 2 ? "" : data.鍗曟嵁鍙�
@@ -785,6 +791,8 @@
                                 , "HDeleteMan": data.浣滃簾浜�
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
                             });
+
+                            $("#HStandard").prop("checked", data.榛樿瑙勭▼);
                             let type = OperationType
 
                             if (OperationType == 3 && data['瀹℃牳浜�'] != '' && data['瀹℃牳浜�'] != null) {
@@ -795,6 +803,8 @@
                             if (OperationType == 2) {
                                 $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
                             }
+
+                            form.render()
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
@@ -816,12 +826,22 @@
                         //console.log('gouba' + result);
                         if (result.count == 1) {
                             option.data = result.list[0];
-                            console.log(option.data)
-                            console.log(result.list[0][0]["榛樿瑙勭▼"])
-                            $("#HStandard").prop("checked",result.list[0][0]["榛樿瑙勭▼"])
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (!option.data[i]['HStdMaintainResult']) {
+                                    option.data[i]['HStdMaintainResult'] = 'OK'
+                                }
+
+                            }
                             table.render(option);
                             option1.data = result.list[1];
                             table.render(option1);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdMaintainResult' + i + 1 + ''))
+                                $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                            }
+                            form.render('select');
+
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -879,6 +899,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(buttonArr[i - 1]['HStdMaintainResult'])
+                }
+                form.render('select');
             }
             //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
@@ -907,6 +932,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdMaintainResult' + i + 1 + ''))
+                        $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                    }
+                    form.render('select');
                 }
             }
             //澶嶅埗涓�琛�
diff --git "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Add_Edit_WL_YayBill.html" "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Add_Edit_WL_YayBill.html"
index 8b7d4a9..7c7067c 100644
--- "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Add_Edit_WL_YayBill.html"
+++ "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Add_Edit_WL_YayBill.html"
@@ -679,14 +679,14 @@
                 , upload = layui.upload
                 , element = layui.element;
             var option = [];
-            var sBillType = "3321";
+            var sBillType = "6667";
             var HModName = "Add_Edit_Gy_QCVerificationBill"
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "3321";
+            var HModuleType = "6667";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
@@ -1642,7 +1642,7 @@
                     , { field: 'HMouldWidth', title: '瀹瑰櫒瀹藉害'}
                     , { field: 'HMouldHeight', title: '瀹瑰櫒楂樺害'}
                     , { field: 'HMouldFoldHeight', title: '鎶樺彔楂樺害'}
-                    , { field: 'HSNP', title: '鏍囧噯鍖呰鏁伴噺'}
+                    , { field: 'HSNP', title: '鏍囧噯鍖呰鏁伴噺', edit: 'text'}
                     , { field: 'HMouldQty', title: '鍖呰瀹瑰櫒鏁伴噺', edit: 'text'}
                     , { field: 'HQty', title: '鐗╂枡鏁伴噺', edit: 'text'}
                     , { field: 'HVolume', title: '浣撶Н'}
@@ -1834,7 +1834,7 @@
                                     {
                                         "HSourceInterID": tableSub[i].婧愬崟涓诲唴鐮�, "HSourceEntryID": tableSub[i].婧愬崟瀛愬唴鐮�, "HSourceBillNo": tableSub[i].婧愬崟鍗曟嵁,"HMaterID": tableSub[i].HMaterID, "HMaterNumber": tableSub[i].鐗╂枡浠g爜, "HMaterName": tableSub[i].鐗╂枡鍚嶇О,
                                         "HUnitID": tableSub[i].HUnitID, "HMouldID": tableSub[i].HMouldID, "HMouldNumber": tableSub[i].鍣ㄥ叿鍙�, "HMouldName": tableSub[i].鍣ㄥ叿鍚嶇О,
-                                        "HMouldLength": tableSub[i].瀹瑰櫒闀垮害, "HMouldWidth": tableSub[i].瀹瑰櫒瀹藉害, "HMouldHeight": tableSub[i].瀹瑰櫒楂樺害, "HMouldFoldHeight": tableSub[i].瀹瑰櫒鎶樺彔楂樺害, "HSNP": tableSub[i].鏍囧噯鍖呰鏁伴噺, "HMouldQty": tableSub[i].鍖呰瀹瑰櫒鏁伴噺, "HQty": tableSub[i].鐗╂枡鏁伴噺, "HQty_origin": tableSub[i].HQty, "HVolume": rowVolume, "HScatteredVolume": tableSub[i].闆跺崟鍗犵敤浣撶Н
+                                        "HMouldLength": tableSub[i].瀹瑰櫒闀垮害, "HMouldWidth": tableSub[i].瀹瑰櫒瀹藉害, "HMouldHeight": tableSub[i].瀹瑰櫒楂樺害, "HMouldFoldHeight": tableSub[i].瀹瑰櫒鎶樺彔楂樺害, "HSNP": tableSub[i].鏍囧噯鍖呰鏁伴噺, "HMouldQty": tableSub[i].鍖呰瀹瑰櫒鏁伴噺, "HQty": tableSub[i].鐗╂枡鏁伴噺, "HQty_origin": tableSub[i].鐗╂枡鏁伴噺, "HVolume": rowVolume, "HScatteredVolume": tableSub[i].闆跺崟鍗犵敤浣撶Н
                                     }
                                 )
                             }
@@ -1973,6 +1973,7 @@
                                             HMouldLength: checkStatus.data[0].闀垮害,
                                             HMouldWidth: checkStatus.data[0].瀹藉害,
                                             HMouldFoldHeight: checkStatus.data[0].鎶樺彔楂樺害,
+                                            HSNP: checkStatus.data[0].瀹瑰櫒鍖呰浜у搧鏁伴噺,
                                         });
                                     } else {
 
@@ -1996,6 +1997,7 @@
                                                 "HMouldLength": checkStatus.data[i].闀垮害,
                                                 "HMouldWidth": checkStatus.data[i].瀹藉害,
                                                 "HMouldFoldHeight": checkStatus.data[i].鎶樺彔楂樺害,
+                                                "HSNP": checkStatus.data[i].瀹瑰櫒鍖呰浜у搧鏁伴噺,
                                             });
                                         }
                                         option.data = buttonArr;
diff --git "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Pay_WayBillPaymentBillEdit.html" "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Pay_WayBillPaymentBillEdit.html"
index fc916bd..7c94285 100644
--- "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Pay_WayBillPaymentBillEdit.html"
+++ "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/Pay_WayBillPaymentBillEdit.html"
@@ -1341,7 +1341,7 @@
                 //鍏朵粬搴旀敹鍗曞瓙琛ㄥ簭鍒楀寲
                 var sSubStr = JSON.stringify(num);
                 //鎷兼帴搴忓垪鍖栫殑鏁版嵁
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"] + ';' + arrayID;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"] + ';' +"1"+';'+ arrayID;
 
 
                 $.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 3957ab0..35fe43c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -131,7 +131,24 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                         </div>
                                     </div>
-
+                                    <div class="layui-inline ">
+                                        <label class="layui-form-label">鍚堝悓鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HHeTongBill" id="HHeTongBill">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HCustomerName" id="HCustomerName">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+                                        </div>
+                                    </div>
                                     <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                     <div class="layui-inline" style="margin-left:5px;">
                                         <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -1272,7 +1289,9 @@
                 var ColName2 = $("#ColName2").val();//澶嶉�夋
                 var Comparator2 = $("#Comparator2").val()
                 var ColContent2 = $("#ColContent2").val();
-
+                var HHeTongBill = $("#HHeTongBill").val();
+                var HCustomerName = $("#HCustomerName").val();
+                var HMaterName = $("#HMaterName").val();
 
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
@@ -1392,6 +1411,15 @@
                 if (HModel) {
                     sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
                 }
+                 if (HHeTongBill) {
+                     sWhere += " and 鍚堝悓鍙� like '%" + HHeTongBill + "%'";
+                }
+                 if (HMaterName) {
+                    sWhere += " and 浜у搧鍚嶇О like '%" + HMaterName + "%'";
+                }
+                 if (HCustomerName) {
+                    sWhere += " and 瀹㈡埛 like '%" + HCustomerName + "%'";
+                }
                 if (number == 3) {
                     if (HProject) {
                         sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 433329e..911365f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -1,23 +1,25 @@
 锘�<!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">
+    <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/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
     <style type="text/css">
-
         /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
         .layui-form-item .layui-inline {
             margin-top: 5px;
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         /*end*/
         .layui-form-label {
             width: 199px;
@@ -27,8 +29,21 @@
             margin-left: 229px;
             min-height: 36px;
         }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
+
 <body>
     <div id="layout1" class="layui-fluid">
         <div class="layui-row layui-col-space15">
@@ -37,9 +52,12 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                    lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                    lay-submit="" lay-filter="Checker">瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+                                    lay-filter="Exit">閫�鍑�</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -56,7 +74,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍗曟嵁鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+                                                        id="HBillNo" readonly="readonly" autocomplete="off">
                                                     <input id="HInterID" name="HInterID" type="hidden" />
                                                 </div>
                                             </div>
@@ -69,7 +88,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                                    <input type="date" class="layui-input" name="HBeginDate"
+                                                        id="HBeginDate">
                                                 </div>
                                             </div>
                                         </div>
@@ -77,13 +97,16 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+                                                    <input type="date" class="layui-input" name="HEndDate"
+                                                        id="HEndDate">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鐐规鍛ㄦ湡 <label style="color:red"> * </label></label>
+                                                <label class="layui-form-label">鐐规鍛ㄦ湡 <label style="color:red"> *
+                                                    </label></label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle" value="">
+                                                    <input class="layui-input" name="HCheckCycle"
+                                                        lay-verify="HCheckCycle" id="HCheckCycle" value="">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -101,19 +124,22 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea"
+                                                        name="HExplanation" id="HExplanation"></textarea>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark"
+                                                        id="HRemark"></textarea>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
                                                 <div class="layui-input-block" style="width:190px;">
-                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID" value="0">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID"
+                                                        name="HCREATEORGID" id="HCREATEORGID" value="0">
                                                     <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                         <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                     </select>
@@ -124,7 +150,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">榛樿瑙勭▼</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="">
+                                                    <input type="checkbox" name="HStandard" id="HStandard"
+                                                        lay-skin="primary" title="">
                                                 </div>
                                             </div>
                                         </div>
@@ -135,25 +162,29 @@
                                             <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HMaker" id="HMaker"
+                                                        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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HChecker" id="HChecker"
+                                                        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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCloseMan"
+                                                        id="HCloseMan" 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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+                                                        style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
 
@@ -162,25 +193,29 @@
                                             <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HMakeDate"
+                                                        id="HMakeDate" 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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCheckDate"
+                                                        id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCloseDate"
+                                                        id="HCloseDate" 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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HUpDateDate"
+                                                        id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -188,13 +223,15 @@
                                             <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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HDeleteMan"
+                                                        id="HDeleteMan" 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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HDeleteDate"
+                                                        id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -221,6 +258,13 @@
     </div>
     <script type="text/html" id="barDemo">
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script type="text/html" id="HStdDotCheckResult">
+        <select name="HStdDotCheckResult" value="OK" lay-filter="HStdDotCheckResult" id="HStdDotCheckResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
     </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -261,8 +305,8 @@
                 , util = layui.util
                 ;
             var sBillType = "3913";
-            var HModName= "Sb_EquipDotCheckRuleEdit"
-            var unEditable = ["HManagerName"]
+            var HModName = "Sb_EquipDotCheckRuleEdit"
+            var unEditable = ["HManagerName", 'HStdDotCheckResult']
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -310,7 +354,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -334,6 +378,24 @@
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 set_btnSave(data);
             })
+
+            //琛岄�夋嫨澶勭悊锛堥粯璁ょ偣妫�缁撴灉锛�
+            form.on('select(HStdDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult']);
+                }
+                form.render('select');
+            });
+
             //#endregion
 
             //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
@@ -560,6 +622,7 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+                    , { field: 'HStdDotCheckResult', title: "鐐规缁撴灉", templet: '#HStdDotCheckResult', event: 'HStdDotCheckResult' }
                     , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
                     , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
@@ -618,7 +681,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -649,6 +712,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(buttonArr[i - 1]['HStdDotCheckResult'])
+                }
+                form.render('select');
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
@@ -666,6 +734,12 @@
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                     //layer.alert(copyrow);
+
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                        $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                    }
+                    form.render('select');
                 }
             }
             //缂栬緫
@@ -757,12 +831,33 @@
                             var data = result.data;
                             var rowarr = [];
                             for (var i = 0; i < result.data.length; i++) {
-                                rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                                rowarr.push({
+                                    "HDotCheckItemID": data[i].鐐规椤圭洰ID,
+                                    "HDotCheckItem": data[i].鐐规椤圭洰,
+                                    "HDotCheckPart": data[i].鐐规閮ㄤ綅,
+                                    "HClaim": data[i].鍏蜂綋瑕佹眰,
+                                    "HManagerID": data[i].璐熻矗浜篒D,
+                                    "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+                                    "HManagerName": data[i].璐熻矗浜�,
+                                    "HRemark": data[i].瀛愬娉�,
+                                    "HDotCheckItemClassID": data[i].HDotCheckItemClassID,
+                                    "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
+                                    "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID,
+                                    "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О,
+                                    "HStdDotCheckResult": data[i]["鐐规缁撴灉"] || "OK"
+                                });
                             }
                             option.data = rowarr;
                             DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
                             setUneditableCol_WithUneditable(option, unEditable, [])
                             table.render(option);
+
+                            
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                                $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                            }
+                            form.render('select');
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -858,4 +953,5 @@
         }
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index 960a205..5ddec01 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -17,6 +17,23 @@
         .layui-form-label {
             width: 85px;
         }
+
+        .layui-input-block {
+            margin-left: 123px;
+            min-height: 36px;
+        }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
@@ -260,6 +277,13 @@
     <script type="text/html" id="barDemo">
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+     <script type="text/html" id="HStdMaintainResult">
+        <select name="HStdMaintainResult" value="OK" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
+    </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>
@@ -296,7 +320,7 @@
             var option1 = [];//閰嶄欢
             var HModName = "Sb_EquipMaintainRuleListSub1";
             var HModName1 = "Sb_EquipMaintainRuleListSub2";
-            var unEditable = ["HMaintainItem", "HManagerName"]
+            var unEditable = ["HMaintainItem", "HManagerName", 'HStdMaintainResult']
             var unEditable1 = ["HMaterName", "HUnitNumber", "HUnitName"]
             var sBillType = "3912";
             //#endregion
@@ -511,6 +535,24 @@
                 });
             });
 
+            //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
+             form.on('select(HStdMaintainResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult']);
+                }
+                form.render('select');
+            });
+
+
             //#endregion
 
 
@@ -547,6 +589,7 @@
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
+                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResult' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
                     , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
@@ -604,7 +647,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " ","HStdMaintainResult": "OK"  }];
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option);
                 table.render(option1);
@@ -630,7 +673,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ","HStdMaintainResult": "OK"  }];
                 table.render(option);
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option1);
@@ -718,11 +761,24 @@
                             option.data = result.list[0];
                             DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                             setUneditableCol_WithUneditable(option, unEditable, [])
+                             for (var i = 0; i < option.data.length; i++) {
+                                if (!option.data[i]['HStdMaintainResult']) {
+                                    option.data[i]['HStdMaintainResult'] = 'OK'
+                                }
+
+                            }
                             table.render(option);
                             option1.data = result.list[1];
                             DisPlay_HideColumnEdit(HModName1, sessionStorage["HUserName"], option1, table);
                             setUneditableCol_WithUneditable(option1, unEditable1, [])
                             table.render(option1);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdMaintainResult' + i+1 + ''))
+                                $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult'])
+                            }
+                            form.render('select');
+
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -780,6 +836,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+                for (i = 1; i <= buttonArr.length; i++) {
+                    console.log($('#HStdMaintainResult' + i + 1 + ''))
+                    $('#HStdMaintainResult' + i + '').val(buttonArr[i - 1]['HStdMaintainResult'])
+                }
+                form.render('select');
             }
             //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
@@ -808,6 +869,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                     for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdMaintainResult' + i + 1 + ''))
+                        $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                    }
+                    form.render('select');
                 }
             }
             //澶嶅埗涓�琛�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
index 0ed5d8f..a224684 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -659,19 +659,19 @@
                             option.data = rowdata;
                             table.render(option);
                             for (var i = 0; i < result.data.length; i++) {
-                                switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+                                switch (data[i].鍒嗘瀽鏂规硶) {
                                     case "瀹氭�у垎鏋�":
-                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+                                        data[i].鍒嗘瀽鏂规硶 = "1";
                                         break;
                                     case "瀹氶噺鍒嗘瀽":
-                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+                                        data[i].鍒嗘瀽鏂规硶 = "2";
                                         break;
                                     case "鍏朵粬鍒嗘瀽":
-                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+                                        data[i].鍒嗘瀽鏂规硶 = "3";
                                         break;
 
                                 }
-                                $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
+                                $('#HAnalysisMethod' + (i + 1) + '').find("option[value='" + (data[i].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
                                 $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
                                 $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
                                 $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);

--
Gitblit v1.9.1