MES-WEB-LayUI.git

parent: e724ea35 | 补丁 | 提交 | ignore whitespace

zzr99

2021-10-08 9a3a0f5fa00f2d966b003fed6591b53ec03157b8

测试器具

32个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_MouldType.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillList.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillList.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,8 +5,8 @@
    //var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½

 WebTM/views/index.html

@@ -466,7 +466,7 @@
                                <dd>
                                    <a>ä»å¨ç®¡ç</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBill.html">å¨å·éè´å¥åºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html">å¨å·éè´å¥åºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillList.html">å¨å·éè´å¥åºåæ®ç»´æ¤</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html">å¨å·é¢ç¨åºåºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdOutBillList.html ">å¨å·é¢ç¨åºåºåç»´æ¤</a></dd>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_MouldType.html

@@ -259,6 +259,7 @@
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_Add_MouldLifeChangeBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>æ°å¢/ç¼è¾æ¨¡å·å¯¿å½è°æ´å</title>
    <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">
@@ -37,7 +37,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·å¯¿å½è°æ´å</b></h1>
                                <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">
@@ -198,8 +198,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" ,width: 100}
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100}
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100}
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true}
                    , { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
@@ -314,7 +314,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_Add_MouldProdBackBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>æ°å¢/ç¼è¾æ¨¡å·éåºå</title>
    <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">
@@ -38,7 +38,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·éåºå</b></h1>
                                <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">
@@ -63,7 +63,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -219,8 +219,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -335,7 +335,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_Add_MouldProdOutBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>æ°å¢/ç¼è¾æ¨¡å·é¢ç¨å</title>
    <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">
@@ -38,7 +38,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·é¢ç¨å</b></h1>
                                <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">
@@ -63,7 +63,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -218,8 +218,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -334,7 +334,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldLifeChangeBillList.html

@@ -150,8 +150,8 @@
                    , { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
                    , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·', title: 'æ¨¡å·', width: 200 }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·', title: 'å¨å·', width: 200 }
                    , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
                    , { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
                    , { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 200 }
@@ -193,7 +193,7 @@
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                            title: 'æ°å¢æ¨¡å·å¯¿å½è°æ´å',
                            title: 'æ°å¢å¨å·å¯¿å½è°æ´å',
                            closeBtn: 1,
                            shift: 2,
                            area: ['100%', '100%'],
@@ -217,7 +217,7 @@
                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: 'ç¼è¾æ¨¡å·å¯¿å½è°æ´å'
                                , title: 'ç¼è¾å¨å·å¯¿å½è°æ´å'
                                , closeBtn: 1
                                , shade: 0.6 //é®ç½©éæåº¦
                                , maxmin: true //åè®¸å¨å±æå°å

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldMoveStockStepInBill.html

@@ -39,7 +39,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·åå¸å¼è°å¥å</b></h1>
                                <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">
@@ -64,7 +64,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -220,8 +220,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -336,7 +336,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldMoveStockStepInBillList.html

@@ -169,8 +169,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -411,6 +411,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldMoveStockStepOutBill.html

@@ -38,7 +38,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·åå¸å¼è°åºå</b></h1>
                                <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">
@@ -63,7 +63,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -217,8 +217,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -333,7 +333,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldMoveStockStepOutBillList.html

@@ -170,8 +170,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -392,6 +392,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldOtherOutBillEdit.html

@@ -63,7 +63,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -220,8 +220,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -336,7 +336,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldOtherOutBillList.html

@@ -169,8 +169,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -411,6 +411,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdBackBillList.html

@@ -168,8 +168,8 @@
                        //, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -393,6 +393,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -50,7 +50,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·éè´å¥åºå</b></h1>
                                <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">
@@ -564,8 +564,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -750,7 +750,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -1025,7 +1025,7 @@
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                    }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillList.html

@@ -177,8 +177,8 @@
                    , { field: 'åæ®å·', title: 'åæ®å·', width: 200, sort: true }
                    , { field: 'HBillType', title: 'åæ®ç±»å', width: 200,hide: true}
                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 200 }
                    , { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡', width: 200 }
                    , { field: 'åºæ¶æ°é', title: 'åºæ¶æ°é', width: 200, totalRow: true }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdMoveBill.html

@@ -38,7 +38,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·ç´æ¥è°æ¨å</b></h1>
                                <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">
@@ -63,7 +63,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ¨¡å·ä»åº</label>
                                                <label class="layui-form-label">å¨å·ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HWHName" id="HWHName" 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;">
@@ -216,8 +216,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -332,7 +332,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdMoveBillList.html

@@ -169,8 +169,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -411,6 +411,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdOutBillList.html

@@ -169,8 +169,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
@@ -241,7 +241,7 @@
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                            title: 'æ°å¢æ¨¡å·é¢ç¨å',
                            title: 'æ°å¢å¨å·é¢ç¨å',
                            closeBtn: 1,
                            shift: 2,
                            area: ['100%', '100%'],
@@ -265,7 +265,7 @@
                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: 'ç¼è¾æ¨¡å·é¢ç¨å'
                                , title: 'ç¼è¾å¨å·é¢ç¨å'
                                , closeBtn: 1
                                , shade: 0.6 //é®ç½©éæåº¦
                                , maxmin: true //åè®¸å¨å±æå°å
@@ -411,6 +411,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion


 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairChangeBillList.html

@@ -170,8 +170,8 @@
                        , { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ', width: 125, templet: "<div>{{d.å¼å§æ¥æ ==null ?'':layui.util.toDateString(d.å¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ', width: 125, templet: "<div>{{d.ç»ææ¥æ ==null ?'':layui.util.toDateString(d.ç»ææ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'è®¡åå·¥æ¶', title: 'è®¡åå·¥æ¶', width: 125 }
                        , { field: 'å®éå·¥æ¶', title: 'å®éå·¥æ¶', width: 125 }
@@ -266,7 +266,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'æ°å¢æ¨¡å·æ¹å¶ç³è¯·å',
                    title: 'æ°å¢å¨å·æ¹å¶ç³è¯·å',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
@@ -291,7 +291,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'ç¼è¾æ¨¡å·æ¹å¶ç³è¯·å'
                        , title: 'ç¼è¾å¨å·æ¹å¶ç³è¯·å'
                        , closeBtn: 1
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairInBillEdit.html

@@ -830,8 +830,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -1034,7 +1034,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -1145,7 +1145,7 @@
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                    }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairInBillList.html

@@ -203,8 +203,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125, hide: true }
@@ -296,7 +296,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'æ°å¢æ¨¡å·é¢ç¨å',
                    title: 'æ°å¢å¨å·é¢ç¨å',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
@@ -321,7 +321,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'ç¼è¾æ¨¡å·é¢ç¨å'
                        , title: 'ç¼è¾å¨å·é¢ç¨å'
                        , closeBtn: 1
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairOutBillEdit.html

@@ -829,8 +829,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
@@ -1032,7 +1032,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -1143,7 +1143,7 @@
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                    }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairOutBillList.html

@@ -197,8 +197,8 @@
                        , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125, hide: true }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapInBill.html

@@ -41,7 +41,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·æ¥åºå¥åºå</b></h1>
                                <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">
@@ -593,8 +593,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
                    , { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
@@ -792,7 +792,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -1067,7 +1067,7 @@
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                    }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapInBillList.html

@@ -181,7 +181,7 @@
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                    , { field: 'hmainid', title: 'åæ®ID', width: 200, hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 200, sort: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 200, sort: true, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'åæ®å·', title: 'åæ®å·', width: 200, sort: true }
                    , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 200 }
                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
@@ -204,8 +204,8 @@
                    , { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
                    , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
                    , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
                    , { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
                    , { field: 'è¾å©å±æ§åç§°', title: 'è¾å©å±æ§åç§°', width: 200 }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapOutBill.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>æ°å¢/ç¼è¾æ¨¡å·å¤çåºåºå</title>
    <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">
@@ -39,7 +39,7 @@
                                <li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
                                <!--<li>å¶ä»ä¿¡æ¯</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>æ¨¡å·å¤çåºåºå</b></h1>
                                <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">
@@ -598,8 +598,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
                    , { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
@@ -807,7 +807,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                                title: 'æ¨¡å·åè¡¨',
                                title: 'å¨å·åè¡¨',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
@@ -1096,7 +1096,7 @@
                sSubStr = JSON.parse(sSubStr);
                for (var i = 0; i < sSubStr.length; i++) {
                    if (sSubStr[i].HMaterID == "") {
                        layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä»£ç ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä»£ç ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        return Result = false;
                    }
                    if (sSubStr[i].HUnitID == "") {

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapOutBillList.html

@@ -174,7 +174,8 @@
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//åæ®å·
                $("#btnSearch").click();
                sWhere = "";
                get_Display(sWhere);
            });

            //#endregion
@@ -226,8 +227,8 @@
                        , { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
                        , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
                        , { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
                        , { field: 'è¾å©å±æ§åç§°', title: 'è¾å©å±æ§åç§°', width: 200 }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Gy_MouldFile.html

@@ -818,10 +818,10 @@
                        $("#HInterID").val(d.data[0].hmainid);
                        $("#HBillNo").val(d.data[0].åæ®å·);
                        $("#HDate").val(formatDate(d.data[0].æ¥æ));
                        $("#HMouldNo").val(d.data[0].å¨å·ç¼å·);
                        $("#HName").val(d.data[0].å¨å·åç§°);
                        $("#HModel").val(d.data[0].å½åå¨å·è§æ ¼);
                        $("#HModel2").val(d.data[0].å¨å·åå·);
                        $("#HMouldNo").val(d.data[0].æ¨¡å·ç¼å·);
                        $("#HName").val(d.data[0].æ¨¡å·åç§°);
                        $("#HModel").val(d.data[0].å½åæ¨¡å·è§æ ¼);
                        $("#HModel2").val(d.data[0].æ¨¡å·åå·);
                        $("#HDiameter").val(d.data[0].ç´å¾);
                        $("#HSubjoin").val(d.data[0].è¾å©å±æ§);
                        $("#HSubjoin2").val(d.data[0].è¾å©å±æ§2);
@@ -830,7 +830,7 @@
                        //$("#HMaterID").val(d.data[0].HMaterID);
                        //$("#HMaterNumber").val(d.data[0].HMaterNumber);
                        $("#HMouleTypeID").val(d.data[0].HMouldTypeID);
                        $("#HMouleTypeName").val(d.data[0].å¨å·åç±»);
                        $("#HMouleTypeName").val(d.data[0].æ¨¡å·åç±»);
                        $("#HUnitID").val(d.data[0].HUnitID);
                        $("#HUnitName").val(d.data[0].è®¡éåä½);
                        $("#HOutComDate").val(formatDate(d.data[0].åºåæ¥æ));
@@ -839,7 +839,7 @@
                        $("#HDeptName").val(d.data[0].ä½¿ç¨é¨é¨);
                        $("#HSupID").val(d.data[0].HSupID);
                        $("#HSupName").val(d.data[0].ä¾åºå);
                        $("#HMouldStatus").val(d.data[0].å¨å·ç¶æ);
                        $("#HMouldStatus").val(d.data[0].æ¨¡å·ç¶æ);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HWHName").val(d.data[0].é»è®¤ä»åº);
                        //$("#HRoutingID").val(d.data[0].HRoutingID);

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Gy_MouldFileList.html

@@ -166,15 +166,15 @@
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
                        , { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·' }
                        , { field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·' }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°' }
                        , { field: 'æ¨¡å·åå·', title: 'å¨å·åå·' }
                        , { field: 'æ¨¡å·åç±»', title: 'å¨å·åç±»' }
                        , { field: 'æ¨¡å·ç¶æ', title: 'å¨å·ç¶æ' }
                        , { field: 'å½åä»åº', title: 'å½åä»åº' }
                        , { field: 'å½åä»ä½', title: 'å½åä»ä½' }
                        , { field: 'èæä»ç±»å', title: 'èæä»ç±»å' }
                        , { field: 'èæä»', title: 'èæä»' }
                        , { field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·' }
                        , { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°' }
                        , { field: 'æ¨¡å·åå·', title: 'å¨å·åå·' }
                        , { field: 'å½åæ¨¡å·è§æ ¼', title: 'å½åå¨å·è§æ ¼' }
                        , { field: 'åå§æ¨¡å·è§æ ¼', title: 'åå§å¨å·è§æ ¼' }
                        , { field: 'å½åè®¾è®¡å¯¿å½', title: 'å½åè®¾è®¡å¯¿å½' }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Sc_MouldMaintainPlanBillList.html

@@ -160,6 +160,8 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
                get_Display(sWhere);
            }

            //æ¥è¯¢æé®

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Sc_MouldOtherInBillList.html

@@ -411,6 +411,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HBillNo").val("");//åæ®å·
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion

			@@ -5,8 +5,8 @@
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½

			@@ -466,7 +466,7 @@
			<dd>
			<a>ä»å¨ç®¡ç</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBill.html">å¨å·éè´å¥åºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html">å¨å·éè´å¥åºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillList.html">å¨å·éè´å¥åºåæ®ç»´æ¤</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html">å¨å·é¢ç¨åºåºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdOutBillList.html ">å¨å·é¢ç¨åºåºåç»´æ¤</a></dd>

			@@ -259,6 +259,7 @@
			$("#HNumber").val("");
			$("#HName").val("");
			sWhere = "";
			get_Display(sWhere);
			}
			//#endregion

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8" />
			<title>æ°å¢/ç¼è¾æ¨¡å·å¯¿å½è°æ´å</title>
			<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">
			@@ -37,7 +37,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>æ¨¡å·å¯¿å½è°æ´å</b></h1>
			<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">
			@@ -198,8 +198,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" ,width: 100}
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100}
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100}
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true}
			, { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
			@@ -314,7 +314,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],

			@@ -150,8 +150,8 @@
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·', title: 'æ¨¡å·', width: 200 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·', title: 'å¨å·', width: 200 }
			, { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 200 }
			@@ -193,7 +193,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢æ¨¡å·å¯¿å½è°æ´å',
			title: 'æ°å¢å¨å·å¯¿å½è°æ´å',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			@@ -217,7 +217,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾æ¨¡å·å¯¿å½è°æ´å'
			, title: 'ç¼è¾å¨å·å¯¿å½è°æ´å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å

			@@ -39,7 +39,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>æ¨¡å·åå¸å¼è°å¥å</b></h1>
			<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">
			@@ -64,7 +64,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·ä»åº</label>
			<label class="layui-form-label">å¨å·ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" 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;">
			@@ -220,8 +220,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			@@ -336,7 +336,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],

			@@ -169,8 +169,8 @@
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
			@@ -411,6 +411,7 @@
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HBillNo").val("");//åæ®å·
			sWhere = "";
			get_Display(sWhere);
			}
			//#endregion

			@@ -38,7 +38,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>æ¨¡å·åå¸å¼è°åºå</b></h1>
			<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">
			@@ -63,7 +63,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·ä»åº</label>
			<label class="layui-form-label">å¨å·ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" 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;">
			@@ -217,8 +217,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			@@ -333,7 +333,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],

			@@ -170,8 +170,8 @@
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
			@@ -392,6 +392,7 @@
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HBillNo").val("");//åæ®å·
			sWhere = "";
			get_Display(sWhere);
			}
			//#endregion

			@@ -168,8 +168,8 @@
			//, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
			@@ -393,6 +393,7 @@
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HBillNo").val("");//åæ®å·
			sWhere = "";
			get_Display(sWhere);
			}
			//#endregion

			@@ -50,7 +50,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>æ¨¡å·éè´å¥åºå</b></h1>
			<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">
			@@ -564,8 +564,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			@@ -750,7 +750,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -1025,7 +1025,7 @@
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMaterID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}

			@@ -177,8 +177,8 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 200, sort: true }
			, { field: 'HBillType', title: 'åæ®ç±»å', width: 200,hide: true}
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 200 }
			, { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡', width: 200 }
			, { field: 'åºæ¶æ°é', title: 'åºæ¶æ°é', width: 200, totalRow: true }

			@@ -170,8 +170,8 @@
			, { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ', width: 125, templet: "<div>{{d.å¼å§æ¥æ ==null ?'':layui.util.toDateString(d.å¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ', width: 125, templet: "<div>{{d.ç»ææ¥æ ==null ?'':layui.util.toDateString(d.ç»ææ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'è®¡åå·¥æ¶', title: 'è®¡åå·¥æ¶', width: 125 }
			, { field: 'å®éå·¥æ¶', title: 'å®éå·¥æ¶', width: 125 }
			@@ -266,7 +266,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢æ¨¡å·æ¹å¶ç³è¯·å',
			title: 'æ°å¢å¨å·æ¹å¶ç³è¯·å',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			@@ -291,7 +291,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾æ¨¡å·æ¹å¶ç³è¯·å'
			, title: 'ç¼è¾å¨å·æ¹å¶ç³è¯·å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å

			@@ -830,8 +830,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			@@ -1034,7 +1034,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -1145,7 +1145,7 @@
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMaterID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}

			@@ -203,8 +203,8 @@
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125, hide: true }
			@@ -296,7 +296,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢æ¨¡å·é¢ç¨å',
			title: 'æ°å¢å¨å·é¢ç¨å',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			@@ -321,7 +321,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾æ¨¡å·é¢ç¨å'
			, title: 'ç¼è¾å¨å·é¢ç¨å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å

			@@ -829,8 +829,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			@@ -1032,7 +1032,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -1143,7 +1143,7 @@
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMaterID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}

			@@ -197,8 +197,8 @@
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125, hide: true }

			@@ -41,7 +41,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>æ¨¡å·æ¥åºå¥åºå</b></h1>
			<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">
			@@ -593,8 +593,8 @@
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
			, { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
			@@ -792,7 +792,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å¨å·åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -1067,7 +1067,7 @@
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMaterID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¨¡å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}

			@@ -181,7 +181,7 @@
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'hmainid', title: 'åæ®ID', width: 200, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, sort: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, sort: true, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 200, sort: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 200 }
			, { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
			@@ -204,8 +204,8 @@
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
			, { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
			, { field: 'è¾å©å±æ§åç§°', title: 'è¾å©å±æ§åç§°', width: 200 }

			@@ -174,7 +174,8 @@
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#btnSearch").click();
			sWhere = "";
			get_Display(sWhere);
			});

			//#endregion
			@@ -226,8 +227,8 @@
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 200 }
			, { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 200 }
			, { field: 'è¾å©å±æ§åç§°', title: 'è¾å©å±æ§åç§°', width: 200 }

			@@ -818,10 +818,10 @@
			$("#HInterID").val(d.data[0].hmainid);
			$("#HBillNo").val(d.data[0].åæ®å·);
			$("#HDate").val(formatDate(d.data[0].æ¥æ));
			$("#HMouldNo").val(d.data[0].å¨å·ç¼å·);
			$("#HName").val(d.data[0].å¨å·åç§°);
			$("#HModel").val(d.data[0].å½åå¨å·è§æ ¼);
			$("#HModel2").val(d.data[0].å¨å·åå·);
			$("#HMouldNo").val(d.data[0].æ¨¡å·ç¼å·);
			$("#HName").val(d.data[0].æ¨¡å·åç§°);
			$("#HModel").val(d.data[0].å½åæ¨¡å·è§æ ¼);
			$("#HModel2").val(d.data[0].æ¨¡å·åå·);
			$("#HDiameter").val(d.data[0].ç´å¾);
			$("#HSubjoin").val(d.data[0].è¾å©å±æ§);
			$("#HSubjoin2").val(d.data[0].è¾å©å±æ§2);
			@@ -830,7 +830,7 @@
			//$("#HMaterID").val(d.data[0].HMaterID);
			//$("#HMaterNumber").val(d.data[0].HMaterNumber);
			$("#HMouleTypeID").val(d.data[0].HMouldTypeID);
			$("#HMouleTypeName").val(d.data[0].å¨å·åç±»);
			$("#HMouleTypeName").val(d.data[0].æ¨¡å·åç±»);
			$("#HUnitID").val(d.data[0].HUnitID);
			$("#HUnitName").val(d.data[0].è®¡éåä½);
			$("#HOutComDate").val(formatDate(d.data[0].åºåæ¥æ));
			@@ -839,7 +839,7 @@
			$("#HDeptName").val(d.data[0].ä½¿ç¨é¨é¨);
			$("#HSupID").val(d.data[0].HSupID);
			$("#HSupName").val(d.data[0].ä¾åºå);
			$("#HMouldStatus").val(d.data[0].å¨å·ç¶æ);
			$("#HMouldStatus").val(d.data[0].æ¨¡å·ç¶æ);
			$("#HWHID").val(d.data[0].HWhID);
			$("#HWHName").val(d.data[0].é»è®¤ä»åº);
			//$("#HRoutingID").val(d.data[0].HRoutingID);

			@@ -166,15 +166,15 @@
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·' }
			, { field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·' }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°' }
			, { field: 'æ¨¡å·åå·', title: 'å¨å·åå·' }
			, { field: 'æ¨¡å·åç±»', title: 'å¨å·åç±»' }
			, { field: 'æ¨¡å·ç¶æ', title: 'å¨å·ç¶æ' }
			, { field: 'å½åä»åº', title: 'å½åä»åº' }
			, { field: 'å½åä»ä½', title: 'å½åä»ä½' }
			, { field: 'èæä»ç±»å', title: 'èæä»ç±»å' }
			, { field: 'èæä»', title: 'èæä»' }
			, { field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·' }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°' }
			, { field: 'æ¨¡å·åå·', title: 'å¨å·åå·' }
			, { field: 'å½åæ¨¡å·è§æ ¼', title: 'å½åå¨å·è§æ ¼' }
			, { field: 'åå§æ¨¡å·è§æ ¼', title: 'åå§å¨å·è§æ ¼' }
			, { field: 'å½åè®¾è®¡å¯¿å½', title: 'å½åè®¾è®¡å¯¿å½' }

			@@ -160,6 +160,8 @@
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			sWhere = "";
			get_Display(sWhere);
			}

			//æ¥è¯¢æé®