From 56b15c48939c9be8ed4fb1315d0cdbde963d3ea6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 01 十二月 2023 13:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index f79836d..da8d1b3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -321,6 +321,7 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
+                    , totalRow: true
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
@@ -357,9 +358,9 @@
                         , { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200, sort: true }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 115, sort: true }
-                        , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true }
+                        , { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
                         , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true }
-                        , { field: '閲戦', title: '閲戦', width: 200, sort: true }
+                        , { field: '閲戦', title: '閲戦', totalRow: true, width: 200, sort: true }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
@@ -806,6 +807,11 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
+                    if (data[0].鐘舵�� != "宸插鏍�") {
+                        layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+                        return;
+                    }
+
                     layer.open({
                         type: 2
                         , area: ['50%', '50%']

--
Gitblit v1.9.1