From edaac2e373bb8b0842aa528d472838e5384fd2a2 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 30 八月 2022 17:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/系统管理/用户管理/Gy_UserByWorkStation.html | 3 +--
WebTM/views/系统管理/用户管理/Gy_UserByOrg.html | 5 ++---
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByOrg.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByOrg.html"
index bdcb70f..562a4cc 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByOrg.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByOrg.html"
@@ -204,9 +204,8 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
//缁勭粐
- if (obj.event === 'HNumber')
- {
- //椤甸潰灞�-鑷畾涔�
+ if (obj.event === 'HNumber') {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByWorkStation.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByWorkStation.html"
index 8fb803c..a3f29fd 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByWorkStation.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByWorkStation.html"
@@ -204,8 +204,7 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
//宸ヤ綅
- if (obj.event === 'HNumber')
- {
+ if (obj.event === 'HNumber') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index f2dc5a0..c1b83bb 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -280,7 +280,7 @@
}
var list = [];
for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
- list.push(JSON.parse(sSubStr)[i].渚涘簲鍟嗕唬鐮�)
+ list.push(JSON.parse(sSubStr)[i].HSupperNumber)
}
if (isAllEqual(list)) {
layer.msg("鏈夐噸澶嶇殑渚涘簲鍟嗕俊鎭紒");
--
Gitblit v1.9.1