From 68fcb32bf7599f5387b77e2168c8fd692c0ecbfd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 四月 2023 13:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html |  160 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 118 insertions(+), 42 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
index 493d602..d40a165 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
@@ -38,6 +38,7 @@
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1">缂撳瓨鍒楄〃</li>
                             <li lay-id="2">宸蹭笂浼犲垪琛�</li>
+                            <li lay-id="3">宸蹭笂浼犳煡璇�</li>
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item  layui-show">
@@ -51,6 +52,28 @@
                                 <div class="layui-row">
                                     <div class="layui-col-xs12">
                                         <table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">婧愬崟鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
                                     </div>
                                 </div>
                             </div>
@@ -99,7 +122,7 @@
         , form = layui.form
         , element = layui.element;
         //娓呯┖鐣岄潰  new
-
+        var sBillType = '1210'
         //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
         //鍔犺浇婧愬崟绫诲瀷
@@ -107,11 +130,15 @@
         //璇诲彇鍗曟嵁鍒楄〃
         //
 
-        form.on('submit(Cancel)', function () {
-            parent.location.href = "../../../views/index.html"
+
+        //閫�鍑�
+        form.on('submit(cmdCancel)', function () {
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                parent.location.href = "../../../views/index_Mobile.html"
+            });
             //window.close();//鍏抽棴褰撳墠椤�
         })
-
+        //缂栬緫
         form.on('submit(cmdModify)', function () {
             var checkStatus = table.checkStatus('dj-table')
                      , data = checkStatus.data;
@@ -131,7 +158,7 @@
                 }
             })
         });
-
+         //鍒锋柊
         form.on('submit(cmdRefresh)', function () {//
             table.render({
                 elem: '#dj-table'
@@ -140,13 +167,13 @@
                 , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                 , cols: [[
                     { type: 'radio' }
-                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
                     , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
                 ]]
                 , height: 500
@@ -159,18 +186,21 @@
                     , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                     , toolbar: '#toolbarDemo'
                     , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                    , page: true  // 寮�鍚垎椤�
+                    , limits: [20, 40, 80, 100]
+                    , limit: 20
                     , cols: [[
                         { type: 'radio' }
-                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
-                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
                         , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                        , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        , { field: 'HOrgID', title: '缁勭粐', width: 150 }
                     ]]
                     , height: 500
                     , done: function () {
@@ -178,8 +208,6 @@
                     }
                 })
         });
-
-
         //鎾ら攢鍔熻兘
         form.on('submit(cmdRescind)', function () {
             var checkStatus = table.checkStatus('yd-table')
@@ -219,9 +247,7 @@
                     }
                 });
         });
-
-
-
+        //鍒犻櫎
         form.on('submit(cmdDelete)', function () {//鍒犻櫎
             var checkStatus = table.checkStatus('dj-table')
                 , data = checkStatus.data;
@@ -266,10 +292,36 @@
             }
             
         });
+        //鏌ヨ
+        form.on('submit(cmdQuery)', function () {
+            var HBillNo = $("#HBillNo").val();
+            var HSourceBillNo = $("#HSourceBillNo").val();
+            var index = layer.load();//閬僵
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
+                type: "GET",
+                data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(index);
+                    } else {
+                        layer.close(index);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        });
 
 
 
-        var sBillType = '1210'
+
+        
         table.render({
             elem: '#dj-table'
             , url: GetWEBURL() + '/Web/chanpinruk'
@@ -277,13 +329,13 @@
             , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
             , cols: [[
                 { type: 'radio' }
-                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
                 , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
                 , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
             ]]
             , height: 500
@@ -299,24 +351,48 @@
             , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
             , toolbar: '#toolbarDemo'
             , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , page: true  // 寮�鍚垎椤�
+            , limits: [20, 40, 80, 100]
+            , limit: 20
             , cols: [[
                 { type: 'radio' }
-                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
-                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
                 , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 150 }
             ]]
             , height: 500
             , done: function () {
                 layer.closeAll("loading");
             }
         })
+
+        //宸蹭笂浼犳煡璇�
+        table.render({
+            elem: '#sy-table'
+            , toolbar: '#toolbarDemo'
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 15 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 150 }
+            ]]
+            , height: 500
+        })
+
         //鍒锋柊鏄庣粏椤电
         table.render({
             elem: '#mx-table'
@@ -324,7 +400,7 @@
             //, toolbar: '#toolbarDemo'
             // , where: { sMsg: linterid, sMsg2: lentryid }
          , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+           , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
          ]]
          , page: true
          , height: 500

--
Gitblit v1.9.1