From 47e55082076758f63cc1a8495f1f3ef0a4f5ef87 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 20:54:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html   |   82 ++--
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                    |    8 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html |   10 
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html  |   12 
 WebTM/views/系统管理/用户管理/Xt_UserSuplies.html                    |   46 +-
 WebTM/views/基础资料/基础资料/Gy_ConkReasonList_Excel.html           |  230 ++++++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                     |   10 
 WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html              |   15 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html    |   34 ++
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html          |   34 ++
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html             |    2 
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html                  |    4 
 WebTM/views/采购管理/应付单/Cg_PayableBill.html                     |  139 ++++++-
 WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html                 |   15 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html                |    2 
 WebTM/layuiadmin/Scripts/webConfig.js                        |    2 
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html     |   70 ++--
 WebTM/WebTM.csproj                                           |    2 
 WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould_Excel.html        |  230 ++++++++++++++
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html              |    2 
 WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html         |    2 
 21 files changed, 818 insertions(+), 133 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 228c295..4088a86 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -350,6 +350,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" />
@@ -378,6 +379,7 @@
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 75c614e..94e7b45 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     /*var WEBURL = "http://localhost/API/";*/    //娼樻禉娓告湰鍦伴厤缃�  
     var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-   /* var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�*/
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";   //浣欐�濇澃鏈湴閰嶇疆*/
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
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_Material.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_Material.html"
index ab0e607..a7d8ff9 100644
--- "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_Material.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_Material.html"
@@ -172,11 +172,11 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
-                            <div>
-                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+                            <div >
+                                <table class="" id="mainTable" lay-filter="mainTable" ></table>
                             </div>
-                            <div id="page"></div>
+                            <div id="page" style="position:relative;bottom:0;"></div>
                         </div>
                     </div>
                 </div>
@@ -457,7 +457,7 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-80'
+                    , height: 'full-150'
                     , page: false
                     , limit: 50 
                     , done: function (res, curr, count) {
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_PreventErrMould.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_PreventErrMould.html"
index 5b07fb1..ab3441e 100644
--- "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_PreventErrMould.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_PreventErrMould.html"
@@ -85,6 +85,7 @@
                                 <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="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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="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>
@@ -167,6 +168,9 @@
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀵煎叆
+                    case 'set_SouceExcel': set_SouceExcel();
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
@@ -431,7 +435,16 @@
                 });
             }
             //#endregion
-
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '闃查敊瑁呯疆瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: './Gy_PreventErrMould_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
             //#region 鏂板
             function set_AddNew() {
                 layer.open({
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_PreventErrMould_Excel.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_PreventErrMould_Excel.html"
new file mode 100644
index 0000000..a437a95
--- /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_PreventErrMould_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>闃查敊瑁呯疆瀵煎叆</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙ｆā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , upload = layui.upload
+
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/Gy_PreventErrMould/Gy_PreventErrMould_Excel',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                } else {
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+        //#endregion
+
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+                    , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+                    , { field: '闃查敊瑁呯疆鍚嶇О', title: '闃查敊瑁呯疆鍚嶇О', width: 120 }
+                    , { field: '闃查敊瑁呯疆浠ｇ爜', title: '闃查敊瑁呯疆浠ｇ爜', width: 120 }
+                    , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+            //DisPlay_HideColumn();
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        var oldData = option.data;
+                        oldData.splice(obj.tr.data('index'), 1)
+                        option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+            var num = [];
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i] != "") {
+                    num.push(option.data[i])
+                }
+            }
+
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Gy_PreventErrMould/Gy_PreventErrMould_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg(data.Message);
+                        option.data = null;
+                        table.cache["mainTable"] = null;
+                        table.render(option);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
index ebd0ec0..549237a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
@@ -83,6 +83,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -155,6 +156,9 @@
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀵煎叆
+                    case 'set_SouceExcel': set_SouceExcel();
                         break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
@@ -404,7 +408,16 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
-
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏁呴殰鍘熷洜瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: './Gy_ConkReasonList_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
                 //閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html"
new file mode 100644
index 0000000..86d03fa
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏁呴殰鍘熷洜瀵煎叆</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙ｆā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , upload = layui.upload
+
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/Gy_ConkReason/Gy_ConkReason_Excel',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                } else {
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+        //#endregion
+
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+                    , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+                    , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 120 }
+                    , { field: '鏁呴殰鍘熷洜浠ｇ爜', title: '鏁呴殰鍘熷洜浠ｇ爜', width: 120 }
+                    , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+            //DisPlay_HideColumn();
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        var oldData = option.data;
+                        oldData.splice(obj.tr.data('index'), 1)
+                        option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+            var num = [];
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i] != "") {
+                    num.push(option.data[i])
+                }
+            }
+
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Gy_ConkReason/Gy_ConkReason_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg(data.Message);
+                        option.data = null;
+                        table.cache["mainTable"] = null;
+                        table.render(option);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ 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/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index 8bca499..cd1b5f0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -646,7 +646,7 @@
                             , "HMangerName": d.data[0].璐熻矗浜�
                             , "HRemark": d.data[0].琛ㄥご澶囨敞
                             //鍏朵粬淇℃伅
-                            , "hmakers": d.data[0].鍒跺崟浜�
+                            , "hmaker": d.data[0].鍒跺崟浜�
                             , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
                             , "hchecker": d.data[0].瀹℃牳浜�
                             , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
index 4de8122..9bc42e3 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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
@@ -228,6 +228,12 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁翠慨鍙楃悊鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HRepairAccepDate" id="HRepairAccepDate"  autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -913,6 +919,9 @@
                 laydate.render({
                     elem: '#HRepairEndDate'
                 });
+                laydate.render({
+                    elem: '#HRepairAccepDate'
+                });
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -1006,6 +1015,7 @@
                         $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));                       
+                        $("#HRepairAccepDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                     }
                 });
             }
@@ -1065,7 +1075,7 @@
                                 , "HMainSourceBillNo": data.HMainSourceBillNo
                                 , "HMainSourceInterID": data.HMainSourceInterID
                                 , "HMainSourceEntryID": data.HMainSourceEntryID
-
+                                , "HRepairAccepDate": formatDate(data.缁翠慨鍙楃悊鏃ユ湡)
                             });
 
                         } else {
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_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
index c4c02ab..b9208c0 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_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
@@ -129,6 +129,32 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">瑕佹眰瀹屾垚鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" id="HRequestComDate" name="HRequestComDate"  autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏈�杩戜繚鍏绘ā鏁�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HRecentMainModule" lay-verify="HRecentMainModule" id="HRecentMainModule" value="0" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绱妯℃暟</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HCumulativeModule" lay-verify="HCumulativeModule" id="HCumulativeModule" value="0"  autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏈鐢熶骇妯℃暟</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HProductionModule" lay-verify="HProductionModule" id="HProductionModule" value="0"  autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <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>
@@ -1016,6 +1042,9 @@
                 laydate.render({
                     elem: '#HEndDate'
                 });
+                laydate.render({
+                    elem: '#HRequestComDate'
+                });
             }
 
             //鍒濆鍖栬〃鏍�
@@ -1127,6 +1156,7 @@
                         $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HRequestComDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
 
                     }
                 });
@@ -1162,6 +1192,10 @@
                                 , "HMouldMaintainRuleInterNo": data.鍣ㄥ叿淇濆吇瑙勭▼
                                 , "HMaintainLevID": data.HMaintainLevID
                                 , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+                                , "HRequestComDate": formatDate(data.瑕佹眰瀹屾垚鏃ユ湡)
+                                , "HRecentMainModule": data.鏈�杩戜繚鍏绘ā鏁�
+                                , "HCumulativeModule": data.绱妯℃暟
+                                , "HProductionModule": data.鏈鐢熶骇妯℃暟
                             });
                             if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
                                 document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 53c2c5c..24cf9d0 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -145,7 +145,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = TabRow;
+                var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" };//涓嶈兘鐢╰abrow浠ｆ浛锛宭ayui浼氳嚜鍔ㄥ姞涓奿ndex灞炴��
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -263,13 +263,33 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
+                                    var OptionData = checkStatus.data;
+                                    if (checkStatus.data.length > 1) {
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;//鑾峰彇閫夋嫨鍒楃殑绱㈠紩
+                                        for (var i = 0; i < OptionData.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                            if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                                var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" };  // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁�  
+
+                                                table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                                option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                                table.render(option);//娓叉煋鐣岄潰
+                                            }
+                                            option.data[rowIndex + i].HSupID = OptionData[i].HItemID;
+                                            option.data[rowIndex + i].HSupperNumber = OptionData[i].HNumber;
+                                            option.data[rowIndex + i].HSupperName = OptionData[i].HName;
+                                        }
+                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                    } else {
+                                        obj.update({
+                                            HSupID: checkStatus.data[0].HItemID,
+                                            HSupperNumber: checkStatus.data[0].HNumber,
+                                            HSupperName: checkStatus.data[0].HName
+                                        });
+                                    }
                                     //console.log(obj.data);
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HSupID: checkStatus.data[0].HItemID,
-                                        HSupperNumber: checkStatus.data[0].HNumber,
-                                        HSupperName: checkStatus.data[0].HName
-                                    });
+                                    
 
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                                 }
@@ -384,7 +404,7 @@
             }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
-                option.data = [TabRow];
+                option.data = [{ "HSupID": 0, "HSupperNumber": "", "HSupperName": "" }];
                 table.render(option);
             }
 
@@ -444,16 +464,10 @@
 
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
-                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                table.cache["mainTable"].push(NewRow);//灏哊ewRow瀵硅薄娣诲姞鍒皌able.cache["mainTable"]鏁扮粍涓�,  鏁扮粍瀛樺偍浜嗚〃鏍肩殑鎵�鏈夎鏁版嵁
+                option.data = table.cache["mainTable"];//鏇存柊option.data涓烘柊鐨勬暟鎹暟缁勬樉绀哄埌琛ㄦ牸涓�  //灏嗘暟鎹粦瀹氬埌data涓�
 
-                buttonArr = [];//娓呯┖鏁扮粍
-                for (var i = 0; i < tableBak.length; i++) {
-                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
-                }
-                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
-                table.reload("mainTable", {
-                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                })
+                table.render(option);  //娓叉煋琛ㄦ牸
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index ba77c7e..eec789e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -173,6 +173,36 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绱ф�ョ▼搴�</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUrgenLevel" lay-filter="HUrgenLevel" id="HUrgenLevel">
+                                                        <option value="浣�" selected="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">鎶ヤ慨绫诲埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HRepairCategory" id="HRepairCategory" class="layui-input" value="">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎶ヤ慨浜�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HRepairer" id="HRepairer" class="layui-input" value="">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏄惁鏈変骇鑳藉奖鍝�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HIsCapacityImpact" id="HIsCapacityImpact" class="layui-input" value="">
+                                                </div>
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -916,6 +946,10 @@
                                 , "HMainSourceBillNo": data.HMainSourceBillNo
                                 , "HMainSourceInterID": data.HMainSourceInterID
                                 , "HMainSourceEntryID": data.HMainSourceEntryID
+                                , "HRepairCategory": data.鎶ヤ慨绫诲埆
+                                , "HUrgenLevel": data.绱ф�ョ▼搴�
+                                , "HRepairer": data.鎶ヤ慨浜�
+                                , "HIsCapacityImpact": data.鏄惁鏈変骇鑳藉奖鍝�
                             });
 
                         } else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index fc44905..1807470 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -176,7 +176,7 @@
                                                 <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
-                                                    <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
+                                                    <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" value="0" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 8be3475..3559bc0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -1376,7 +1376,7 @@
                                     "HCheckPostID": tableSub[i]["纭鑰呰鑹睮D"],
                                     "HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
                                     "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
-                                    "HRelationID": tableSub[i]["HRelationID"],
+                                    "HRelationID": tableSub[i]["HRelationID"] == null ? "0" : tableSub[i]["HRelationID"],
                                     "HRelationName": relationName,
                                     "HCheckResult": "",
                                     "HRemark": ""
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
index f60e65f..418eecd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
@@ -400,6 +400,8 @@
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+                get_UserList();
                 //鏌ヨ
                 get_Display(sWhere);
                 get_Display2(sWhere);
@@ -594,6 +596,14 @@
                 });
             }
 
+             //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+            function get_UserList() {
+                $("#HDeptID").val(sessionStorage["HDeptID"] );
+                $("#HDeptName").val(sessionStorage["HDept"]);
+                $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+                $("#HCenterName").val(sessionStorage["HWorkCenter"]);
+            }
+
             //杞﹂棿閫夋嫨椤甸潰
             function btnHDeptID() {
                 layer.open({
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index c376574..14bc4e7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -102,14 +102,14 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline" style="width:625px">
+                                        <div class="layui-inline" >
                                             <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
-                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 150px" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 150px;">
                                                 <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                        </button>-->
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -132,25 +132,6 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
-                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
-                                            </div>
-                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閲囪喘鏂瑰紡</label>
                                             <div class="layui-input-inline">
@@ -161,8 +142,8 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        
                                     </div>
+                                    
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">涓荤</label>
@@ -185,6 +166,13 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">椤圭洰缂栫爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                
                                             </div>
                                         </div>
                                     </div>
@@ -239,6 +227,24 @@
                                             <label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
                                             <div class="layui-input-block">
                                                 <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -649,6 +655,7 @@
                                         , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
                                         , "HProjectID": dataArray[0].HProjectID
                                         , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                                        , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                                     });
 
                                     //瀛愯〃Entry  璧嬪��
@@ -749,6 +756,7 @@
                                         , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
                                         , "HProjectID": dataArray[0].HProjectID
                                         , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                                        , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                                         , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
                                     });
                                     //瀛愯〃Entry  璧嬪��
@@ -1800,6 +1808,7 @@
 
                                 , "HProjectID": data.HProjectID == null ? 0 : data.HProjectID
                                 , "HProjectName": data.椤圭洰鍚嶇О
+                                , "HProjectNumber": data.椤圭洰浠ｇ爜
                                 , "HInvoiceBillNo": data.鍙戠エ缂栧彿
 
                                 , "HMaker": data.鍒跺崟浜�
@@ -1939,6 +1948,7 @@
                         , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
                         , "HProjectID": dataArray[0].HProjectID
                         , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                        , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                     });
 
                     //瀛愯〃  璧嬪��
@@ -2020,6 +2030,7 @@
                         , "HPSStyleSName": dataArray[0].閲囪喘鏂瑰紡
                         , "HProjectID": dataArray[0].HProjectID
                         , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                        , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                         , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
                     });
 
@@ -2883,6 +2894,7 @@
                     , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
                     , "HProjectID": dataArray[0].HProjectID
                     , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                    , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                 });
 
                 //瀛愯〃Entry  璧嬪��
@@ -2985,6 +2997,12 @@
                         return;
                     }
                 }
+                if (dataArray[0].婧愬崟绫诲瀷 == "1102") {
+                    getPushSource_POOrderBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+                } else {
+                    getPushSource_POInStockBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+                }
+                
 
                 form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                     "HMainSourceInterID": "0"
@@ -3000,15 +3018,16 @@
                     , "HEmpName": dataArray[0].涓氬姟鍛�
                     , "HSupID": dataArray[0].HSupID
                     , "HSupName": dataArray[0].渚涘簲鍟�
-                    , "HCurID": dataArray[0].HCurID
-                    , "HCurName": dataArray[0].甯佸埆
-                    , "HExRate": dataArray[0].姹囩巼
+                    //, "HCurID": dataArray[0].HCurID
+                    //, "HCurName": dataArray[0].甯佸埆
+                    //, "HExRate": dataArray[0].姹囩巼
                     , "HSSID": "0"
                     , "HSSName": ""
                     , "HPSStyleID": dataArray[0].HPSStyleID
                     , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
                     , "HProjectID": dataArray[0].HProjectID
                     , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                    , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
                     , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
                 });
 
@@ -3197,7 +3216,69 @@
             }
             //#endregion
 
-            
+            //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曞竵鍒眹鐜�
+            function getPushSource_POOrderBillCur(HSourceInterID, HSourceEntryID) {
+                var res = "none";
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HInterID": HSourceInterID
+                        , "HSubID": HSourceEntryID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            res = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HCurID": res.HCurID
+                                , "HCurName": res.甯佸埆
+                                , "HExRate": res.姹囩巼
+                            });
+                        } else {
+                            res = result.data;
+                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曞竵鍒眹鐜�
+            function getPushSource_POInStockBillCur(HSourceInterID, HSourceEntryID) {
+                var res = "none";
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_POInStockBill/loadCg_POInStockBill_Push",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HInterID": HSourceInterID
+                        , "HSubID": HSourceEntryID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            res = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HCurID": res.HCurID
+                                , "HCurName": res.甯佸埆
+                                , "HExRate": res.姹囩巼
+                            });
+                        } else {
+                            res = result.data;
+                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
 
             //#endregion
 
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index df2cfdc..0d2f742 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -2179,6 +2179,8 @@
             $("#HProjectName").val(data[0].椤圭洰鍚嶇О);
             $("#HProjectNumber").val(data[0].椤圭洰浠ｇ爜);
             $("#HProjectID").val(data[0].HInterID);
+            $("#HLinkMan").val(data[0].鑱旂郴浜�);
+            $("#HLinkPhone").val(data[0].鑱旂郴浜虹數璇�);
         }
         //鍙屽嚮杩斿洖浠撳簱
         function GetHWHValue(data) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 15d3de8..33528ee 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -1086,7 +1086,7 @@
                     }
                     var rowData = option.data[i];   //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
                     for (var col of Object.keys(rowData)) {  //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭  Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
-                        if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID" || col == "HPrice" || col=="HMoney")) {  //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+                        if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) {  //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
                             layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0                          濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
                             return;
                         }
@@ -1194,39 +1194,7 @@
                     });
                 }
             }
-            //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
-            function getCustomerByCusID(HCusID) {
-                $.ajax({
-                    url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
-                    async: false,
-                    type: "GET",
-                    data: {
-                        "HCusID": HCusID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data[0];
-
-                            $("#HCurID").val(data.HCurID);
-                            $("#HCurName").val(data.HCurName);
-                            $("#HExRate").val(data.HExRate);
-                            $("#HSSID").val(data.HSSID);
-                            $("#HSSName").val(data.HSSName);
-                            //璁剧疆榛樿璐у竵淇℃伅
-                            if (data.HCurID == 0) {
-                                $("#HCurID").val(1);
-                                $("#HCurName").val("浜烘皯甯�");
-                                $("#HExRate").val(1);
-                            }
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-        //#endregion
+            
             //琛屽唴蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1288,6 +1256,7 @@
                                             , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
                                             , "HUnitID": OptionData.HUnitID
                                             , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+                                            , "HQty": 1
                                         })
                                         OptionData = [];
                                     }
@@ -1433,6 +1402,7 @@
                                     , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
                                     , "HUnitID": OptionData.HUnitID
                                     , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+                                    , "HQty": 1
                                 })
                                 OptionData = [];
                             }
@@ -1834,8 +1804,11 @@
                             $("#HProjectID").val(checkStatus.data[0].HInterID);
                             $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
                             $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+                            $("#HCusID").val(checkStatus.data[0].HCusID == null ? 0 : checkStatus.data[0].HCusID)
+                            $("#HCusName").val(checkStatus.data[0].瀹㈡埛)
                             $("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
-                            $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴鐢佃瘽);
+                            $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴浜虹數璇�);
+                            getCustomerByCusID($("#HCusID").val());
                         } else {
                             layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
                         }
@@ -1906,6 +1879,39 @@
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
+        //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
+        function getCustomerByCusID(HCusID) {
+            $.ajax({
+                url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+                async: false,
+                type: "GET",
+                data: {
+                    "HCusID": HCusID
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        $("#HCurID").val(data.HCurID);
+                        $("#HCurName").val(data.HCurName);
+                        $("#HExRate").val(data.HExRate);
+                        $("#HSSID").val(data.HSSID);
+                        $("#HSSName").val(data.HSSName);
+                        //璁剧疆榛樿璐у竵淇℃伅
+                        if (data.HCurID == 0) {
+                            $("#HCurID").val(1);
+                            $("#HCurName").val("浜烘皯甯�");
+                            $("#HExRate").val(1);
+                        }
+                    } else {
+                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!" + 鏈煡璇㈠埌瀹㈡埛淇℃伅, { icon: 5 });
+                }
+            });
+        }
+        //#endregion
         // 鍩虹璧勬枡杩斿洖鏁版嵁
         function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
         {
@@ -1937,7 +1943,11 @@
                 $("#HProjectID").val(obj[0].HInterID);
                 $("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
                 $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
-
+                $("#HCusID").val(obj[0].HCusID == null ? 0 : obj[0].HCusID)
+                $("#HCusName").val(obj[0].瀹㈡埛)
+                $("#HLinkMan").val(obj[0].鑱旂郴浜�);
+                $("#HLinkPhone").val(obj[0].鑱旂郴浜虹數璇�);
+                getCustomerByCusID($("#HCusID").val());
             } else {
                 layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
             }
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 927fd4b..96a1a0c 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -536,9 +536,9 @@
                 }
                 //#endregion
 
-                //if (AllowLoadData(data)) {
+                if (AllowLoadData(data)) {
                     set_SaveBill(data);
-                //}
+                }
             });
             //#endregion
             //#endregion
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 19e5aa5..42dfea8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -578,10 +578,10 @@
             //#endregion
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            //var HModuleType = "1205";
-            ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
-            //$("h1").html('<b>' + HPageTitle + '</b>');
+            var HModuleType = "1205";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
 			//#endregion
 
             //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 45514fb..4885901 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -81,19 +81,18 @@
                                                 <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
-
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs8 layui-inline">
+                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline" style="width:750px">
-                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
-                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
@@ -104,8 +103,6 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">楠屾敹鍛�</label>
                                             <div class="layui-input-inline">
@@ -126,6 +123,9 @@
                                                 </button>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">涓氬姟鍛�</label>
                                             <div class="layui-input-inline">
@@ -136,8 +136,6 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                             <div class="layui-input-inline">
@@ -156,30 +154,19 @@
                                                 </button>
                                             </div>
                                             <!--<label class="layui-form-label">閫夊崟鍙�</label>
-                    <div class="layui-input-inline">
-                        <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
-                    </div>-->
+        <div class="layui-input-inline">
+            <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+        </div>-->
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">璐熻矗浜�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -200,6 +187,20 @@
                                                 <input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
                                             </div>
                                         </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        
                                     </div>
                                     <!--<div class="layui-row">
 
@@ -2378,14 +2379,15 @@
             //琛屽唴鍒犻櫎
             function set_GridDelete(obj) {
                 var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
+                var rowIndex = $(obj.tr).attr("data-index");//鑾峰彇琛岀储寮�
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
                         if (rowIndex === '0') {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.reload(option);
                             layer.close(index);
@@ -2469,9 +2471,9 @@
                             res = result.data;
                             //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
-                    }, error: function () {
+                    }, error: function (err) {
                         res = "none";
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                        layer.alert("鍙戠敓閿欒!"+err, { icon: 5 });
                     }
                 });
                 return res;
@@ -2520,9 +2522,9 @@
                             res = result.data;
                             //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
-                    }, error: function () {
+                    }, error: function (err) {
                         res = "none";
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                        layer.alert("鍙戠敓閿欒!" + err, { icon: 5 });
                     }
                 });
                 return res;

--
Gitblit v1.9.1