From 1a40b7a8d4e6e24db362715b030ca9dfc1e2035e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 03 四月 2024 10:19:26 +0800
Subject: [PATCH] 销售出库明细报表:分组合计增加千分号、控制小数位数

---
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html |   72 ++++++++++++++++++++++++++---------
 1 files changed, 53 insertions(+), 19 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index 934666a..f3cfe4e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -144,22 +144,37 @@
          //缂栬緫
         form.on('submit(cmdModify)', function () {
             var checkStatus = table.checkStatus('dj-table')
-                     , data = checkStatus.data;
-            //ajaxLabelData = data;
-            //layer.alert(rows);
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '鍏朵粬鍑哄簱鍗�'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
-                , resize: false
-                , cancel: function () {
-                    $(".layui-btn").removeClass("layui-btn-disabled");
+                , data = checkStatus.data;
+
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": sBillType },
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '鍏朵粬鍑哄簱鍗�'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                            , resize: false
+                            , cancel: function () {
+                                $(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                    }
+                    else {
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 }
-            })
+            });
         });
         //鍒锋柊
         form.on('submit(cmdRefresh)', function () {
@@ -215,9 +230,20 @@
         //鎾ら攢鍔熻兘
         form.on('submit(cmdRescind)', function () {
             var checkStatus = table.checkStatus('yd-table')
-                , data = checkStatus.data;
-            var sInterID = data[0].HInterID
-            var sBillNo = data[0].HBillNo
+            var checkStatus2 = table.checkStatus('sy-table');
+            var checkStatus3 = table.checkStatus('dj-table');
+            var data = "";
+            if (checkStatus.data.length != 0) {
+                data = checkStatus.data;
+            } else if (checkStatus2.data.length != 0) {
+                data = checkStatus2.data;
+            } else if (checkStatus3.data.length != 0) {
+                data = checkStatus3.data;
+            } else {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+            }                
+            var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
             var sBillType = '1206'
             $.ajax(
                 {
@@ -257,7 +283,7 @@
                 , data = checkStatus.data;
             if (checkStatus.data.length === 1) {
                 layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                    var sInterID = data[0].HInterID;
+                    var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
                     $.ajax(
                         {
                             type: "Get",
@@ -426,6 +452,14 @@
                     };
                     table.render(option);
                 }
+            },
+            error: function (err) {
+                layer.msg('閿欒' + err, {
+                    icon: 5,
+                    time: 20000
+                }, function () {
+                    //do something
+                });
             }
         })
         

--
Gitblit v1.9.1