From 3aedb186b2cf0b8a8dedbcc55e59b6d3249dd4c6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 21 十一月 2022 13:48:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html | 36 +--
WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html | 219 ++++++++++++++++----------
WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html | 181 +++++++++-------------
3 files changed, 224 insertions(+), 212 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
index f3382d2..16779c6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
@@ -27,7 +27,7 @@
</style>
</head>
<body>
-
+
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 15px;">
<div class="layui-card-body" style="padding: 1px;">
@@ -43,54 +43,54 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓婄彮鏃堕棿</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓浜�</label>
+ <label class="layui-form-label">涓婄彮鏃堕棿</label>
<div class="layui-input-inline">
- <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍖呰鏉愯川</label>
+ <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
</div>
</div>
</div>
-
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
</div>
<input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
</form>
</div>
</div>
@@ -111,7 +111,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , laydate = layui.laydate;
var sWhere = "";
var date = new Date();
var day = date.getDate();
@@ -120,10 +121,37 @@
var shijian = year + "-" + month + "-" + day;
//#endregion
-
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
+ laydate.render({
+ elem: '#HWorkBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HWorkEnd'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNoonbreakBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNoonbreakEnd'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNightbreakBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNightbreakEnd'
+ , type: 'time'
+ });
//#region 杩涘叆椤甸潰鍗冲姞杞�
- $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
+ $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -175,7 +203,7 @@
form.on('submit(HEmp-BT)', function () {
get_checkEmp();
});
-
+
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
@@ -201,7 +229,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "Gy_PackType/cx",
+ url: GetWEBURL() + "Gy_WorkDay/cx",
type: "GET",
data: {
"HInterID": linterid
@@ -221,21 +249,13 @@
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- ,"HNumber": data.鍖呰鏂瑰紡浠ｇ爜
- , "HName": data.鍖呰鏂瑰紡鍚嶇О
- , "HParentID": data.HParentID
- , "HShortNumber": data.鐭唬鐮�
- , "HHelpCode": data.鍔╄鐮�
- //, "HMakeEmp": data.鍒涘缓浜�
- , "HPackMaterial": data.鍖呰鏉愯川
- , "HLevel": data.绛夌骇
- , "HLenhth": data.闀�
- , "HWidth": data.瀹�
- , "HHeight": data.楂�
- //, "HStopflag": data.绂佺敤鏍囪
- , "HRemark": data.澶囨敞
- , "HUseFlag": data.浣跨敤鏍囪
- , "HMakeTime": Format(data.鍒涘缓鏃堕棿, "yyyy-MM-dd")
+ , "HDate": data.HDate
+ , "HWorkBegin": data.HWorkBegin
+ , "HWorkEnd": data.HWorkEnd
+ , "HNoonbreakBegin": data.HNoonbreakBegin
+ , "HNoonbreakEnd": data.HNoonbreakEnd
+ , "HNightbreakBegin": data.HNightbreakBegin
+ , "HNightbreakEnd": data.HNightbreakEnd
});
layer.close(ajaxLoad);
} else {
@@ -253,33 +273,9 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
var sMainStr = JSON.stringify(data.field);
- if (!$("#HNumber").val()) {
- layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HName").val()) {
- layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忓悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HMakeEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨鍒涘缓浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HLenhth").val()) {
- layer.msg("璇疯緭鍏ラ暱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HWidth").val()) {
- layer.msg("璇疯緭鍏ュ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HHeight").val()) {
- layer.msg("璇疯緭鍏ラ珮锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_PackType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
dataType: "json",
@@ -302,33 +298,6 @@
});
}
//#endregion
-
- //#region 閫夋嫨鑱屽憳鏂规硶
- function get_checkEmp() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鑱屽憳鍒楄〃'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HMakeEmp").val(checkStatus.data[0].HName);
- $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
-
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
index 022d3cd..a4277e7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
@@ -25,15 +25,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍖呰浠ｇ爜</label>
+ <label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍖呰鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HDate" id="HDate">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
- var HModName = "Gy_PackType";
+ var HModName = "Gy_WorkDay";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HParentID",];
//#endregion
-
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
@@ -218,7 +215,7 @@
var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_PackType/list',
+ url: GetWEBURL() + '/Gy_WorkDay/list',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -286,12 +283,10 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
+ var HDate = $("#HDate").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
-
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -313,11 +308,8 @@
}
sWhere += " and " + ColName + " " + com;
}
- if (HNumber) {
- sWhere += " and 鍖呰鏂瑰紡浠ｇ爜 like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 鍖呰鏂瑰紡鍚嶇О like '%" + HName + "%'";
+ if (HDate) {
+ sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -341,7 +333,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '鍖呰鏂瑰紡鍒楄〃-鏂板'
+ , title: '宸ヤ綔鏃�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
})
@@ -358,7 +350,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , title: '宸ヤ綔鏃�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
})
@@ -378,7 +370,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'DeltetGy_PackType',
+ url: GetWEBURL() + 'DeltetGy_WorkDay',
type: "GET",
data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
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_SOPBill.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_SOPBill.html"
index a7e7adf..33b5e67 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_SOPBill.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_SOPBill.html"
@@ -1,5 +1,5 @@
锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>浣滀笟鎸囧涔�</title>
@@ -34,7 +34,7 @@
}
.layui-table-cell{
- height:20px;
+ height:23px;
}
</style>
@@ -51,7 +51,7 @@
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">閫�鍑�</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="IsAuto" style="background-color:#959393;margin-left:15px" id="auto">鑷姩鎾斁</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">鑷姩鎾斁</button>
</div>
<div class="layui-inline">
<h1 style="text-align: center;margin-left:300px"><b>宸ヤ綅浣滀笟鎸囧涔�</b></h1>
@@ -90,19 +90,13 @@
<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
<div style="margin-top:10px; width:100%;height:100%">
<div style="width:77%;height:670px;float:left;line-height:500px">
- <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin:200px 0 0 1.5px;font-size:25px"><</button>-->
<div class="layui-carousel" id="test1">
- <div carousel-item>
- <div><img src="浣滀笟鎸囧涔�.png" style="width:100%;height:100%"></div>
- <div><img id="img" src="" style="width:100%;height:100%"></div>
- <div><img src="../../../Files/R-C.jpg" style="width:100%;height:100%"></div>
-
- <!--<div><embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>-->
+ <div carousel-item id="file">
+
</div>
</div>
- <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin-top:200px;font-size:25px">></button>-->
</div>
<div style="width:22%;height:670px;float:left;margin-left:1%">
<div style="width:100%;height:49%;margin-bottom:2%">
@@ -124,7 +118,7 @@
</div>
</div>
<script type="text/html" id="barDemo">
- <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <!--<a class="layui-btn layui-btn-xs" lay-event="view">鏌ョ湅</a>-->
<!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript">
@@ -140,28 +134,6 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
- // 鎶ュ伐骞冲彴;宸ュ簭娴佽浆鍗＄淮鎶�;鐢熶骇璧勬簮鍒楄〃
-
- //1.杩涘叆妯″潡锛屼粠鏈湴閰嶇疆鏂囦欢鑾峰彇鎵�灞炵敓浜ц祫婧愬拰宸ヤ綅锛屽垵濮嬪寲妯″潡銆傜晫闈㈡竻绌猴紝鍙宠竟涓婄綉鏍兼樉绀鸿鐢熶骇璧勬簮鐢熶骇鐘舵�佽〃閲岀殑褰撴棩璁″垝宸ュ崟锛岄粯璁や负褰撳墠寮�宸ョ殑宸ュ崟锛屼笅缃戞牸鏄剧ず杩欎釜宸ュ崟鍙婅宸ヤ綅鐨勬枃浠舵竻鍗�(鑾峰彇浣滀笟鎸囧涔︾殑鏁版嵁)銆�
-
- //2.宸﹁竟鏄剧ず宸ヤ綅浣滀笟鎸囧涔︾殑绗竴寮犳枃浠�(鍥剧墖鎴朠DF) 銆�
-
- //3.鐐瑰嚮涓婁竴寮狅紝涓嬩竴寮狅紝鍙互鍦ㄤ綔涓氭寚瀵间功鐨勬湰宸ヤ綅鐨勬枃浠跺垪琛ㄩ噷鍒囨崲PDF鏂囦欢鎴栧浘鐗�;
-
- //4.宸ュ崟鍒楄〃閲岋紝鍙屽嚮鎴栬�呯偣鏌ョ湅鎸夐挳锛屽彲浠ュ垏鎹㈠伐鍗曪紝宸﹁竟 浣滀笟鎸囧涔︿篃鐩稿簲鏀瑰彉锛屼笅缃戞牸鐨勬枃浠跺垪琛ㄤ篃搴旀敼
- //鍙�;
-
- //5.鑷姩鎾斁鎸夐挳锛岀偣鍑昏嚜鍔ㄦ挱鏀炬寜閽紝杩涜鑷姩鎾斁妯″紡锛屾寜閽悕瀛楁敼涓衡�滄墜鍔ㄦ挱锛� 鐐瑰嚮 鎵嬪姩鎾斁 鎸夐挳锛屸�濊繘琛屾墜鍔ㄦ挱鏀炬ā寮�
-
- //6.鎵嬪姩鎾斁妯″紡涓嬶紝涓嶆墜鍔ㄥ垏鎹紝褰撳墠宸ュ崟锛屼綔涓氭寚瀵间功鍧囦笉鍋氬彉鏇淬��
-
- //7.鑷姩鎾斁妯″紡涓嬶紝姣�2鍒嗛挓鍋氫竴娆℃煡璇紝鑾峰彇褰撳墠寮�宸ョ殑宸ュ崟锛屽鏋滅洰鍓嶅紑宸ョ殑宸ュ崟鍜岀晫闈笂鏄剧ず鐨勫伐鍗曚笉绗﹀悎鏃讹紝鑷姩鍒囨崲鍒板紑宸ョ殑宸ュ崟锛屼綔涓氭寚瀵间功涔熺浉鍏虫洿鏂�
-
- //8.閫�鍑烘寜閽�傞��鍑烘湰妯″潡銆�
-
-
- //浜у搧鏍规嵁宸ュ崟鏉ワ紱鑷姩鎾斁锛氬綋鍓嶅伐搴忓畬鎴愬悗鑷姩鍒囨崲鎸囧涔︾瓑锛屾墜鍔ㄦ挱鏀撅細绾︾瓑浜庝粈涔堥兘涓嶅仛锛涘伐鍗曞垪琛ㄩ噷鏄剧ず褰撴棩闇�瑕佽繘琛屽緱浠诲姟锛涢〉闈㈣皟鏁翠负鍏ㄥ睆鏄剧ず锛�
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -184,9 +156,9 @@
var option = [];
var option2 = [];
var arr = [];
+ var HInterID;
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- $("#img").attr("src", "http://localhost:8082/LuBaoUi/Files/OIP-C.jpg")
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_InitGrid2();
@@ -196,9 +168,9 @@
, width: '100%' //璁剧疆瀹瑰櫒瀹藉害
, height: '100%' //璁剧疆瀹瑰櫒楂樺害
, arrow: 'always' //濮嬬粓鏄剧ず绠ご
- , indicator: 'none' //鎸囩ず鍣ㄤ笉鏄剧ず
+ , indicator: 'inside' //鎸囩ず鍣ㄤ笉鏄剧ず
, autoplay: false //鎵嬪姩鎾斁
- , interval: 2000 //鎾斁閫熷害
+ , interval: 3000 //鎾斁閫熷害
});
//#region 鑾峰彇鏃堕棿鏃ユ湡
$(document).ready(function () {
@@ -224,13 +196,27 @@
});
//#endregion
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
- get_Display(sWhere);
- get_Display2(sWhere);
- get_Display2(sWhere);
+ //#region 鍔犺浇鏁版嵁鍒扮綉鏍�
+ //get_Display(sWhere);
- //鍒ゆ柇鎿嶄綔绫诲瀷
+ //閲囩敤寤舵椂鐨勬柟寮忕瓑寰呮暟鎹�
+ get_Display(sWhere);
+ setTimeout(function () { get_Display2(sWhere); }, 1000);
+ setTimeout(function () { get_Display2(sWhere); }, 1000);
+ setTimeout(function () { get_Display3(sWhere); }, 1000);
+ setTimeout(function () { ins.reload({ autoplay: false }) }, 1500);
+ //#endregion
+
+ //#region 鑷姩鎾斁妯″紡涓嬭幏鍙栭〉闈俊鎭殑鏂规硶
+ function set_LoadAgain() {
+ get_Display(sWhere);
+ get_Display2(sWhere);
+ get_Display3(sWhere);
+ setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌＄敤鍒�)
if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
//鍒濆鍩烘湰淇℃伅璧嬪��
}
@@ -240,10 +226,10 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
-
//#endregion
- //閫�鍑�
+
+ //#region 閫�鍑�
form.on('submit(Exit)', function (data) {
if (linterid == undefined) {
//鍏抽棴椤电
@@ -254,63 +240,78 @@
Pub_Close(1);
}
});
-
- //鏄惁鑷姩鎾斁
- form.on('submit(IsAuto)', function (data) {
- var num = 0;
- if (ins.config.autoplay == false) {
- ins.reload({ autoplay: true }) //鎾斁鏂瑰紡鏀逛负鑷姩鎾斁
+ //#endregion
+ //#region 鏄惁鑷姩鎾斁
+ form.on('submit(Autoplay)', function (data) {
+ var num = 0;
+ if (document.getElementById("auto").innerHTML == "鑷姩鎾斁") {
+ //ins.reload({ autoplay: true }) //杞挱鍥炬挱鏀炬柟寮忔敼涓鸿嚜鍔ㄦ挱鏀�
document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁";
+ var timer = setInterval(function () {
+ set_LoadAgain();
+ if (document.getElementById("auto").innerHTML === "鑷姩鎾斁") {
+ clearInterval(timer); //鏆傚仠鍛ㄦ湡鍑芥暟
+ }}, 120000) //姣忛殧涓ゅ垎閽熸墽琛屼竴娆�
num = 1;
- } else if (ins.config.autoplay == true && num == 0) {
- ins.reload({ autoplay: false }) //鎾斁鏂瑰紡鏀逛负鎵嬪姩鎾斁
+ } else if (document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁" && num == 0) {
+ //ins.reload({ autoplay: false }) //杞挱鍥炬挱鏀炬柟寮忔敼涓烘墜鍔ㄦ挱鏀�
document.getElementById("auto").innerHTML = "鑷姩鎾斁";
}
});
+ //#endregion
- //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛� 锛堣繖閲屾病鐢ㄥ埌锛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
break;
- //澶嶅埗涓�琛�
- case 'btn-CopyLine': btnCopyLine(data);
- break;
- //鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
- break;
}
});
- //琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- //set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- });
- //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
- //table.on('edit(mainTable)', function (obj) {
- // var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- // , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- // , field = obj.field; //寰楀埌瀛楁
- // arr.push(data);
- //});
+ //#endregion
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- console.log(obj);
+ //#region 鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
//var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
//HBillNo = datas["鍗曟嵁鍙�"].toString();
//var HMainID = datas.hmainid;
var wait = layer.load();
+ HInterID = obj.data.HInterID
+ if (HInterID == "" || HInterID == null) {
+ HInterID = 0;
+ }
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
$.ajax({
url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
type: "GET",
- //data: { "sWhere": HMainID },
+ data: { "sWhere": HInterID },
success: function (data1) {
if (data1.count == 1) {
option2.data = data1.data;
table.render(option2);
+
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
+ var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
+ html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
+ var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
+ html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ }
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ ins.reload({ autoplay: false })
layer.close(wait);
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -321,12 +322,10 @@
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
- //DisPlay_HideColumn_Sec();
- //set_ClearBillHMainID(HMainID); //鍣ㄥ叿娓呭崟
});
//#endregion
- //鍒濆鍖栬〃鏍�
+ //#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
option = {
id: 'mainTable'
@@ -345,7 +344,7 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: '宸ュ簭', title: '宸ュ簭', width: 100 }
- //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 60 }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
@@ -375,8 +374,9 @@
}
};
}
-
- //鍔犺浇缃戞牸
+ //#endregion
+
+ //#region 鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
$.ajax({
@@ -385,6 +385,9 @@
data: { "sWhere": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ if (data1.data[0]) {
+ HInterID = data1.data[0].HInterID
+ }
option.data = data1.data;
table.render(option);
layer.close(wait);
@@ -401,11 +404,14 @@
//鍔犺浇鍙充笅鏂圭綉鏍�
function get_Display2(sWhere) {
+ if (HInterID == "" || HInterID == null) {
+ HInterID = 0;
+ }
var wait = layer.load();
$.ajax({
url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
type: "GET",
- //data: { "sWhere": HMainID },
+ data: { "sWhere": HInterID },
success: function (data1) {
if (data1.count == 1) {
option2.data = data1.data;
@@ -421,7 +427,52 @@
}
});
}
-
+
+ //鍔犺浇宸︿晶鏂囦欢
+ function get_Display3(sWhere) {
+ if (HInterID == "" || HInterID == null) {
+ HInterID = 0;
+ }
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
+ type: "GET",
+ data: { "sWhere": HInterID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
+ var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
+ html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
+ var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
+ html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ }
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ ins.reload({ autoplay: false })
+ //layer.close(wait);
+ } else {
+ //layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ //layer.close(wait);
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
--
Gitblit v1.9.1