From 5127038d4716728cf1b7f291dfc0dfa9e2c58f9d Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 七月 2021 17:08:34 +0800
Subject: [PATCH] 20210720v1
---
WebTM/views/IpadIndex.html | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index b381893..7585cad 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -63,7 +63,7 @@
});
function TSLoad() {
$("#topleft").html("");
- var HUserName = "Admin" //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
+ var HUserName = sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
type: "GET",
@@ -143,7 +143,7 @@
data: { "HSourceID": HSourceID },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
-
+
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
@@ -199,7 +199,7 @@
html1 += '<div class="layui-col-sm12 layui-col-md12">';
html1 += '<dl class="topright">;'
html1 += '<dt>';
- html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../ layuiadmin/layui/images/erro.png";">';
+ html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
html1 += '</dt>';
html1 += '<dd>';
html1 += '<h1><span>褰撳墠璁惧锛�</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
@@ -573,6 +573,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -733,7 +737,7 @@
sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')"; //鍋滃伐鎸傝捣鐘舵��
break;
case "姹囨姤":
- html1 = '';
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //姹囨姤鐘舵��
break;
case "鎶ユ鐢宠":
@@ -763,7 +767,7 @@
flag = false;
}
});
- console.log(flag);
+
return flag;
}
</script>
@@ -809,7 +813,7 @@
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
- <div class="layui-row layui-col-space10" id="btomleft">
+ <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">
</div>
</div>
@@ -874,8 +878,8 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenInSpection(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenInSpection(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-release imgicon"></span>
<span class="imgtitle">鎶ユ鐢宠</span>
@@ -894,8 +898,8 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenStop(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-play imgicon"></span>
<span class="imgtitle">鍋滃伐</span>
--
Gitblit v1.9.1