From 5385b3e4f5dffbe0478c341ddca53a61db037c78 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 28 七月 2021 17:19:42 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 22 +++++++++-------------
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 1 -
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 15 ++++++++++-----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index ca3e95c..c1c9f1d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -45,11 +45,11 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-form"></i>娴忚</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -108,6 +108,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
@@ -241,15 +244,16 @@
type: "GET",
data: { "HItemID": ItemID },
success: function (result) {
- console.log('gouba' + result);
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
get_Display(sWhere);
layer.close(ajaxLoad);
} else {
+ layer.close(ajaxLoad);
layer.alert(result.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -280,6 +284,7 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ sWhere = "";
}
//#endregion
@@ -298,7 +303,7 @@
//#region 鍒锋柊
function get_Refresh() {
- sWhere = "";
+ set_ClearQuery();
get_Display(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index eece156..aae1074 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -206,12 +206,11 @@
//#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var rowid = 0;
- var rows = 0;
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
@@ -355,7 +354,7 @@
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
title: '鐢熶骇浠诲姟鍗曞垪琛�',
- shift: 0,
+ shift: 2,
area: ['90%', '90%'],
content: ['../../PublicPage/ProductionOrder.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -416,7 +415,7 @@
},
success: function (layero, index) {
- layer.full(index);
+ //layer.full(index);
}
});
});
@@ -519,8 +518,6 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- rows++;
- layer.msg('澧炲姞涓�琛屾寜閽紒')
}
//#endregion
@@ -528,10 +525,10 @@
function btnCopyLine(data) {
var copydata = JSON.stringify(data);
if (data.length <= 0) {
- layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
else if (data.length > 1) {
- layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
}
else {
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
@@ -549,7 +546,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -576,7 +572,7 @@
title: '鐗╂枡鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['90%', '90%'],
maxmin: true,
content: ['../../PublicPage/PartInformation.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -614,7 +610,7 @@
title: '鍗曚綅鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['90%', '90%'],
maxmin: true,
content: ['../../PublicPage/UnitInformation.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -655,7 +651,7 @@
title: '璧勬簮鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['90%', '90%'],
maxmin: true,
content: ['../../PublicPage/SourceInformation.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -696,7 +692,7 @@
title: '璧勬簮鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['90%', '90%'],
maxmin: true,
content: ['../../PublicPage/UserInformation.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index f566f7c..31b6ca8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -513,7 +513,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
-
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
--
Gitblit v1.9.1