From 4004817453256e980f07073e7c84fffade0c678f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 11 七月 2022 09:52:32 +0800
Subject: [PATCH] excel导入

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html |  303 ++++++++++++++++++++++++++++++++++++++++++++++++++
 WebSRM/WebSRM.csproj                                                      |    1 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html     |    1 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html       |    1 
 WebSRM/Scripts/webConfig.js                                               |    3 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html                         |    3 
 6 files changed, 310 insertions(+), 2 deletions(-)

diff --git a/WebSRM/Scripts/webConfig.js b/WebSRM/Scripts/webConfig.js
index b4ab07e..eb4ebb5 100644
--- a/WebSRM/Scripts/webConfig.js
+++ b/WebSRM/Scripts/webConfig.js
@@ -5,7 +5,8 @@
     //var WEBURL = "http://10.0.2.11:8083/WEB-API/";
     //var WEBURL = "http://192.168.31.47:8083/WEB-API/";
     //var WEBURL = "http://localhost:8082/srmAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/srmAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:8082/srmAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    var WEBURL = "http://localhost:8082/SRMAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     
     return WEBURL
 }
\ No newline at end of file
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 16a755d..4781cab 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -868,6 +868,7 @@
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_EntrustOrderTrackBill.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockTrackBill.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList - 澶嶅埗.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList_Excel.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_SystemLogList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderTrackBill.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList.html" />
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 59e2293..97d10d8 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -271,6 +271,7 @@
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: true*/ }
                     , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
                     , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 180 }
+                    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 180 }
                     //, { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
                     //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
                     , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120, sort: true }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 59be4d6..32e5dc7 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -256,6 +256,7 @@
                     , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
                     , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
                     , { field: 'FStockInQty', title: '绱鍏ュ簱鏁伴噺', width: 120 }
+                    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 120 }
                     , { field: 'FMRBQTY', title: '绱閫�鏂欐暟閲�', width: 120 }
                     //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
                     , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120, sort: true }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html
new file mode 100644
index 0000000..db472a9
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html
@@ -0,0 +1,303 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Excel瀵煎叆</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/layui/layui.js" charset="utf-8"></script>
+    <script src="../../../../Scripts/webConfig.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="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 class="layui-row">
+                                        <!--琛ㄥご绛涢�夋潯浠�-->
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;" class="layui-this">瀵煎叆淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">閲囪喘璁㈠崟淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--瀵煎叆淇℃伅-->
+                                <div class="layui-tab-item layui-show">
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <!--閲囪喘璁㈠崟淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
+                        </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' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , excel = layui.excel
+            , upload = layui.upload
+            , element = layui.element;
+
+        var option = [];
+        var option2 = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/POOrderBillExcel/POOrderBillExcelImport',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            before: function (data) {
+                loadIndex = layer.load(2);
+            },
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                    set_InitGrid2();
+                    get_Display2();
+                    layer.close(loadIndex);
+                } else {
+                    layer.close(loadIndex);
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            ////鍒濆鍖栬〃鏍�  瀵煎叆淇℃伅
+            set_InitGrid1();
+        }
+
+        //#endregion
+
+        //鍒濆鍖栬〃鏍�  瀵煎叆淇℃伅
+        function set_InitGrid1() {
+            var columns = [];
+            columns.push({ type: 'checkbox', fixed: 'left' });
+            columns.push({ field: '缁勭粐', title: '缁勭粐', width: 150 });
+            columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 });
+            columns.push({ field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 150 });
+            columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150 });
+            columns.push({ field: '鏁伴噺', title: '鏁伴噺', width: 150 });
+            columns.push({ field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 150 });
+            //columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-190'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [columns]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+        }
+
+        //鍒濆鍖栬〃鏍�  閲囪喘璁㈠崟淇℃伅
+        function set_InitGrid2() {
+            var columns = [];
+            columns.push({ type: 'checkbox', fixed: 'left' });
+            columns.push({ field: '閲囪喘缁勭粐', title: '缁勭粐', width: 150 });
+            columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 });
+            columns.push({ field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 150 });
+            columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150 });
+            columns.push({ field: '鍗曟嵁鍙�', title: '閲囪喘璁㈠崟鍙�', width: 150 });
+            columns.push({ field: 'HRQty', title: '搴旀敹鏁伴噺', width: 150 });
+            columns.push({ field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 150 });
+            columns.push({ field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 150 });
+            columns.push({ field: '鍒涘缓鏃ユ湡', title: '鍒涘缓鏃ユ湡', width: 150, templet: "<div>{{d.鍒涘缓鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒涘缓鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  });
+            columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150, templet: "<div>{{d.浜よ揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  });
+            //columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+            option2 = {
+                elem: '#mainTable2'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-190'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [columns]
+            };
+        }
+
+        //閲囪喘璁㈠崟淇℃伅鏌ヨ
+        function get_Display2() {
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/POOrderBillExcel/POOrderBillExcelList",
+                async: true,
+                data: { "sqlWhere": "" },
+                success: function (result) {
+                    option2.data = result.data;
+                    table.render(option2);
+                },
+                error: function (result) {
+                    console.log(result);
+                }
+            });
+        }
+
+        //鐢熸垚閫佽揣鍗�(淇濆瓨)
+        function set_AddNew(data) {
+            var checkStatus = table.cache['mainTable2']
+                , data = checkStatus;
+            //鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
+            var ids = "";
+            var entryids = "";
+            $.each(data, function (obj) {
+                ids += data[obj].hmainid + ",";
+                entryids += data[obj].hsubid + ",";
+            })
+            ids = ids.substring(0, ids.length - 1);
+            entryids = entryids.substring(0, entryids.length - 1);
+            var hasPrivileage = true;
+            $.ajax({
+                url: GetWEBURL() + 'TestSaverPOInStock',
+                type: 'get',
+                async: false,
+                traditional: true,   //閲嶇偣
+                data: {
+                    "ids": ids,
+                    "entryids": entryids //閲嶇偣
+                },
+                success: function (data) {
+                    if (data.code == "0") {
+                        layer.alert(data.Message, { icon: 5 });
+                        hasPrivileage = false;
+                        table.reload('mainTable2', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , page: {
+                                curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+                            }
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                        return hasPrivileage;
+                    }
+                },
+                error: function (e) {
+                    layer.alert(e.Message, { icon: 5 });
+                }
+            });
+            if (!hasPrivileage) {
+                return;
+            }
+            var rows = '';
+            var HEntry = '';
+            for (var i = 0; i < data.length; i++) {
+                if (data[i]["鏈叧鑱旀暟閲�"] == 0) {
+                    layer.msg("鍗曟嵁鍙�:" + data[i]["鍗曟嵁鍙�"] + "宸插叏閮ㄧ敓鎴愰�佽揣鍗曪紒", { icon: 5 });
+                    return;
+                }
+                if (data[i]["鐘舵��"] == "宸茬‘璁�") {
+                    rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
+                }
+                else {
+                    HEntry += (i + 1) + ',';
+                }
+            }
+            if (HEntry != '') {
+                HEntry = HEntry.substring(0, HEntry.length - 1);
+                layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+            }
+            else {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閫佽揣鍗�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString()+'&lentryid=1,12&lSourceBillType=Excel', 'yes']
+                    , resize: false
+                    //, cancel: function () {
+                    //    $(".layui-btn").removeClass("layui-btn-disabled");
+                    //}
+                })
+            }
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
index e2282a8..d1e7639 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
@@ -138,6 +138,7 @@
                                         <dd data-name="SRM_POOrderBillList_UnConfirm"><a lay-href="SRM/SRM_POOrderBillList.html?type=UnConfirm">鏈‘璁ら噰璐鍗�</a> </dd>
                                         <dd data-name="SRM_POOrderBillList_ReConfirm"><a lay-href="SRM/SRM_POOrderBillList.html?type=ReConfirm">宸茬‘璁ら噰璐鍗�</a></dd>
                                         <dd data-name="SRM_POOrderBillList_ReBack"><a lay-href="SRM/SRM_POOrderBillList.html?type=ReBack">宸查┏鍥為噰璐鍗�</a></dd>
+                                        <dd data-name="SRM_POOrderBillList_Excel"><a lay-href="SRM/SRM_POOrderBillList_Excel.html">Excel瀵煎叆</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -331,7 +332,7 @@
                     success: function (data1) {
                         document.getElementById("mydiv").innerHTML = '<iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>';
                         if (data1.data.OA_InformBillMain.length > 0) {
-                            console.log(data1);
+                            //console.log(data1);
                             if (flag == 0) {
                                 $(".layui-badge").html(data1.data.OA_InformBillMain.length);
                             }

--
Gitblit v1.9.1