From ccc8dae75d11efabec9051e0729ed20f3678704d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 09 十二月 2024 08:12:41 +0800
Subject: [PATCH] 1

---
 WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html |  189 +++++++++++++++++++++++++++++++----------------
 1 files changed, 125 insertions(+), 64 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
index 8564045..fd0989b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
@@ -31,21 +31,49 @@
                     </div>
                     <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <div class="layui-col-xs3">
-                                <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
-                            </div>
-                            <div class="layui-col-xs7">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                            </div>
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
-                            </div>
-                            <div class="layui-row">
+                            <div class="layui-col-xs6">
                                 <div class="layui-col-xs3">
-                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">鏁伴噺</label>
+                                    <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
                                 </div>
-                                <div class="layui-col-xs7">
+                                <div class="layui-col-xs9">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+                                </div>
+                                <div class="layui-col-xs5">
                                     <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                                <div class="layui-col-xs4">
+                                    <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
                                 </div>
                             </div>
                         </div>
@@ -81,12 +109,12 @@
                                                     <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                 </div>
                                                 <div class="layui-col-xs2">
-                                                    <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width:55px;">
+                                                    <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                     </button>
                                                 </div>
                                                 <div class="layui-col-xs2" style="float: right;">
-                                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 40px; margin-left: 0px;padding-left:10px">OK</button>
+                                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                 </div>
                                             </div>
                                         </div>
@@ -104,12 +132,14 @@
                                             <div class="layui-col-xs3">
                                                 <label class="layui-form-label" style="width: 70px; padding-left: 0px;">鍏堣繘鍏堝嚭浠�</label>
                                             </div>
-                                            <div class="layui-col-xs7">
-                                                <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
-                                            </div>
-                                            <div class="layui-col-xs2">
-                                                <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="padding:0 26.5px">...</button>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs10" style="padding-right: 15px;">
+                                                    <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                         <div class="layui-row">
@@ -148,38 +178,6 @@
                                 </div>
                                 <!--琛ㄥご淇℃伅-->
                                 <div class="layui-tab-item">
-                                    <div class="layui-form-item" style="padding:0px;margin:0px">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
-                                            </div>
-                                            <div class="layui-col-xs10">
-                                                <div class="layui-col-xs10">
-                                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item" style="padding:0px;margin:0px">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
-                                            </div>
-                                            <div class="layui-col-xs10">
-                                                <div class="layui-col-xs10">
-                                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
                                             <div class="layui-col-xs2">
@@ -241,6 +239,18 @@
                                                 <div class="layui-col-xs2">
                                                     <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
                                                 </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍑哄簱绫诲瀷</label>
+                                            </div>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <select name=" HStockStyle" id="HStockStyle">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -526,9 +536,10 @@
                 }
 
                 //榛樿鏄剧ず椤甸潰
-                element.tabChange('tab-Kf_OtherOutBill_PDA', '2');
+                element.tabChange('tab-Kf_OtherOutBill_PDA', '1');
                 set_InitDate();         //鍒濆鍖栬〃鍗曟椂闂�
                 set_InitBillSubType();  //鑾峰彇鍗曟嵁瀛愮被鍨�
+                get_StockOutStyle();    //鑾峰彇鍑哄簱绫诲瀷
                 set_InitGrid();         //鍒濆鍖栬〃鏍�
 
                 var data = [];
@@ -575,6 +586,27 @@
                                 HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
                             }
                             $("#HBillSubType").append(HBillSubType);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //鑾峰彇鍑哄簱绫诲瀷
+            function get_StockOutStyle() {
+                var HStockStyle = '';
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetStockOutStyle_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HStockStyle += '<option value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HStockStyle").append(HStockStyle);
                             form.render('select');
                         }
                         layer.closeAll("loading");
@@ -630,6 +662,32 @@
             })
             //#endregion
 
+            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(wl-table)', function (obj) {
+                var data = obj.data;
+
+                //鐗╂枡浠g爜瓒呴摼鎺�
+                if (obj.event == '鐗╂枡浠g爜') {                      //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠g爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var HMaterNumber = data.鐗╂枡浠g爜.toString();    //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠g爜
+                    layer.open({                                    //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                                     //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '鍙婃椂搴撳瓨淇℃伅'                     //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1                               //鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6                                //閬僵閫忔槑搴�
+                        , maxmin: false                              //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0                                   //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,                            //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
             //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
             if (HInterID != 0) {
                 HSourceFlag = true;
@@ -642,7 +700,7 @@
                 //鏄剧ず琛ㄤ綋鏄庣粏
                 DisBillEntryList();
                 HSourceFlag = true;
-                element.tabChange('tab-Kf_OtherOutBill_PDA', '2');
+                element.tabChange('tab-Kf_OtherOutBill_PDA', '3');
             }
             else {
                 //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
@@ -835,7 +893,6 @@
                                     $("#HStockPlaceName").removeAttr("disabled");
                                     $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                 }
-                                element.tabChange('tab-Kf_OtherOutBill_PDA', '2');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -918,7 +975,6 @@
                                 $("#HStockPlaceID").val(result.data[0].HItemID);
                                 $("#HWHName").val(result.data[0].HWhName);
                                 $("#HWHID").val(result.data[0].HWHID);
-                                element.tabChange('tab-Kf_OtherOutBill_PDA', '2');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -1528,7 +1584,7 @@
                             //瀹㈡埛涓嶅彲缂栬緫
                             $("#HSupName").attr("disabled", "disabled");
                             $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
-                            element.tabChange('tab-Kf_OtherOutBill_PDA', '2');
+                            element.tabChange('tab-Kf_OtherOutBill_PDA', '3');
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
                             //鏄剧ず琛ㄤ綋鏄庣粏
@@ -1682,7 +1738,6 @@
                                         $("#HStockPlaceName").removeAttr("disabled");
                                         $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                     }
-                                    element.tabChange('tab-Kf_OtherOutBill_PDA', '2');  //璺宠浆椤电
                                     return;//缁撴潫
                                 }
                                 else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
@@ -1690,7 +1745,6 @@
                                     $("#HStockPlaceID").val(result.data.hSPIDField);
                                     $("#HWHName").val(result.data.hWhNameField);
                                     $("#HWHID").val(result.data.hWhIDField);
-                                    element.tabChange('tab-Kf_OtherOutBill_PDA', '2');//璺宠浆椤电
                                     return;//缁撴潫
                                 }
                                 else if (result.data.hBarTypeField == '閮ㄩ棬鏉$爜') {
@@ -1819,19 +1873,26 @@
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
+                                } else if (data[i].name == '鐗╂枡浠g爜') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠g爜', event: '鐗╂枡浠g爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鐗╂枡浠g爜 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } else {
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                             break;
                                         default:
 
                                         if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉$爜涓暟') {
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+                                        } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                         } else {
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
                                         }
                                     }
                                 }

--
Gitblit v1.9.1