From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html |  267 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 196 insertions(+), 71 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 6bff735..0d52020 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -55,6 +55,7 @@
                     <div style="padding: 10px; ">
                         <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="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">鍒楄缃�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <div class="layui-tab-content">
@@ -199,9 +200,9 @@
             <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
             <option value="100035">钃濇捣閫氳鍏徃</option>
             <option value="100037">閫氳鍏徃鏈儴</option>
-            <option value="100038">鎵嬫満浜嬩笟閮�</option>
+            <option value="100038">鏉窞宸ュ巶</option>
             <option value="100039">骞虫澘浜嬩笟閮�</option>
-            <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+            <option value="100040">姹熷北宸ュ巶</option>
             <option value="100041">钃濇捣閿�鍞叕鍙�</option>
             <option value="100042">棣欐腐閿�鍞叕鍙�</option>
             <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
@@ -272,6 +273,61 @@
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
 
+        
+            var HModName = "JIT_NeedMaterPlanBill";
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , totalRow: true
+                , height: 'full-270'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                    , { field: 'HUnitIDName', title: '璁¢噺鍗曚綅', edit: 'text', event: "HUnitID" }
+                    , { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true}
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HProdORGID', title: '鐢熶骇缁勭粐', templet: "#HProdORGIDSub" }
+                    , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
+                    , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text', totalRow: true}
+                    , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+                    , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+                    , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
+                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+                    , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text', totalRow: true}
+                    , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text' }
+                    , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text' }
+                    , { field: 'HICMOBillSEQ', title: '鐢熶骇璁㈠崟琛屽彿', edit: 'text' }
+                    , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+                    , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+                    , { field: 'HReciveQty', title: '鍏ュ簱鏁伴噺', edit: 'text', totalRow: true }
+                    , { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
+                    , { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text', totalRow: true }
+                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
+                    , { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
+                    , { field: 'HICMOEmpIDName', title: '鐢熶骇璁㈠崟鍒跺崟浜�', edit: 'text', event: "HICMOEmpID" }
+                    , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text', totalRow: true}
+                    , { field: 'HICMOBillDate', title: '鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡', event: "HICMOBillDate", width: 200 }//date
+                    , { field: 'HICMOBillDeliveryDate', title: '鐢熶骇璁㈠崟浜よ揣鏃ユ湡', event: "HICMOBillDeliveryDate", width: 200 } // date
+                    , { field: 'HICMOBillRemark', title: '鐢熶骇璁㈠崟鎽樿', edit: 'text' }
+                    , { field: 'HICMOBillNote', title: '鐢熶骇璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            DisPlay_HideColumn();
+
             var params = getUrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -293,63 +349,11 @@
                 });
             }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                //$("#HProdORGID").attr("disabled", true);
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
             }
-
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                , cellMinWidth: 120
-                , height: 'full-270'
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
-                    , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
-                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
-                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
-                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                    , { field: 'HUnitIDName', title: '璁¢噺鍗曚綅', edit: 'text', event: "HUnitID" }
-                    , { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
-                    , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
-                    , { field: 'HProdORGID', title: '鐢熶骇缁勭粐', templet: "#HProdORGIDSub" }
-                    , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
-                    , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
-                    , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
-                    , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
-                    , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
-                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
-                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
-                    , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
-                    , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text' }
-                    , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text' }
-                    , { field: 'HICMOBillSEQ', title: '鐢熶骇璁㈠崟琛屽彿', edit: 'text' }
-                    , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
-                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
-                    , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
-                    , { field: 'HReciveQty', title: '鍏ュ簱鏁伴噺', edit: 'text' }
-                    , { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
-                    , { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
-                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
-                    , { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
-                    , { field: 'HICMOEmpIDName', title: '鐢熶骇璁㈠崟鍒跺崟浜�', edit: 'text', event: "HICMOEmpID" }
-                    , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
-                    , { field: 'HICMOBillDate', title: '鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡', event: "HICMOBillDate", width: 200 }//date
-                    , { field: 'HICMOBillDeliveryDate', title: '鐢熶骇璁㈠崟浜よ揣鏃ユ湡', event: "HICMOBillDeliveryDate", width: 200 } // date
-                    , { field: 'HICMOBillRemark', title: '鐢熶骇璁㈠崟鎽樿', edit: 'text' }
-                    , { field: 'HICMOBillNote', title: '鐢熶骇璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
-                ]]
-            }
-
-            //鍒濆鍔犺浇琛ㄦ牸
-            option.data = rowdata;
-            table.render(option);
-
+         
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -506,6 +510,11 @@
                 }
             });
 
+            //闅愯棌鍒楄缃�
+            form.on('submit(HideColumn)', function (data) {
+                get_HideColumn();
+            });
+
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -600,6 +609,7 @@
                 $.ajax({
                     type: "get",
                     url: GetWEBURL() + "/Web/GetOrganizations",
+                    async:false,
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data;
@@ -607,6 +617,7 @@
                                 Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                             }
                             $("#HProdORGID").append(Organization);
+                            $("#HProdORGID").val(sessionStorage["OrganizationID"]);
                             form.render('select');
                         }
                         layer.closeAll("loading");
@@ -682,7 +693,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -694,7 +705,7 @@
                         }
                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptIDName").val(checkStatus.data[0].HName);
+                        $("#HDeptIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                 })
@@ -744,7 +755,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -758,9 +769,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HMaterModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -778,7 +789,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -791,7 +802,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HUnitID": checkStatus.data[0].HItemID
-                                        , "HUnitIDName": checkStatus.data[0].HName
+                                        , "HUnitIDName": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -809,7 +820,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -822,15 +833,128 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HICMOEmpID": checkStatus.data[0].HItemID
-                                        , "HICMOEmpIDName": checkStatus.data[0].HName
+                                        , "HICMOEmpIDName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                             })
                         }
+
+                        obj.event = "";
                         return false;
                     }
 
+                })
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
                 })
             }
 
@@ -841,6 +965,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (d) {
 
@@ -849,7 +974,7 @@
                             "HBillNo": d.data[0].鍗曟嵁鍙�
                             , "HInterID": d.data[0].hmainid
                             , "HAddress": d.data[0].浜よ揣鍦扮偣
-                            , "HProdORGID": d.data[0].涓荤敓浜х粍缁�
+                            , "HProdORGID": d.data[0].HProdORGID
                             , "HDeptID": d.data[0].HDeptID
                             , "HDeptIDName": d.data[0].杞﹂棿鍚嶇О
                             , "HSettleCurrId": d.data[0].HSettleCurrId
@@ -902,9 +1027,9 @@
                         }
                         form.render('select');
                         form.render('checkbox');
-                    
-                       
-                      
+
+
+
                     }
                 })
             }
@@ -929,7 +1054,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
-                
+
                 var index = layer.load();
                 $.ajax({
                     type: "POST",

--
Gitblit v1.9.1