From 42aee5b9502267881fe29584ce32898f83206eb5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html | 22 ++++++++---
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapInBillList.html | 26 +++++++-----
WebTM/views/IpadIndex.html | 17 ++++++--
WebTM/layuiadmin/Scripts/webConfig.js | 2
4 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7980c71..974d139 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣�
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7585cad..975644c 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -63,7 +63,7 @@
});
function TSLoad() {
$("#topleft").html("");
- var HUserName = sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
+ var HUserName = "Admin"; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
type: "GET",
@@ -161,6 +161,8 @@
html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
@@ -364,7 +366,9 @@
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
-
+ HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -710,7 +714,10 @@
data.push({
"workcode": workcode,
"HSourceID": HSourceID1,
- "HSourceName": HSourceName1
+ "HSourceName": HSourceName1,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HMaker": "Admin" //sessionStorage["HUserName"]
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -892,7 +899,7 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-chart imgicon"></span>
<span class="imgtitle">涓嶈壇閲囬泦</span>
</div>
@@ -912,7 +919,7 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-close imgicon"></span>
<span class="imgtitle">閫�鍑�</span>
</div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldScrapInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldScrapInBillList.html"
index 847c440..d10c8c1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldScrapInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldScrapInBillList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板/缂栬緫妯″叿鎶ュ簾鍏ュ簱鍗�</title>
+ <title>鏂板/缂栬緫鎶ュ簾鍏ュ簱鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -215,6 +215,7 @@
// }, function () { window.location.href = "../../user/login.html"; });
//}
var tableReload = table.reload;
+ //鍒濆鍖栫綉鏍�
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -254,13 +255,16 @@
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
- //鍒ゆ柇鏄惁鏂板
+
+ //鏍规嵁閫掑叆寰桰D 鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
+ //鏂板
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"","HSPName":"", "HRemark": "" }];
table.render(option);
}
else {
+ //淇敼
$("#HInterID").val(hID);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
@@ -295,7 +299,7 @@
var AddRow = table.cache['mainTable'];
var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
switch (obj.event) {
- case 'btn-AddLine':
+ case 'btn-AddLine': //澧炶
//table.cache["mainTable"].push(AddRow[rows]);
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
@@ -303,7 +307,7 @@
rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
break;
- case 'btn-CopyLine':
+ case 'btn-CopyLine'://澶嶅埗琛�
var copydata = JSON.stringify(data);
if (data.length <= 0) {
layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
@@ -322,7 +326,7 @@
break;
}
});
- //琛屽唴浜嬩欢
+ //琛屽唴浜嬩欢 鍒犻櫎琛�
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
@@ -344,9 +348,9 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event === 'HMaterCode') //妯″叿淇℃伅
+ if (obj.event === 'HMaterCode') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
- //椤甸潰灞�-鑷畾涔�
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -600,7 +604,7 @@
});
- //鐩戝惉鍗曞厓鏍肩紪杈�
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
@@ -665,9 +669,9 @@
});
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご 淇敼鏃朵粠鏁版嵁搴� 鑾峰彇鏁版嵁鍔犺浇鍒拌〃澶�
{
- alert(hID);
+ //alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai",
@@ -708,7 +712,7 @@
});
}
-
+ //鏃ユ湡妗� 榛樿涓轰粖澶�
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index 5d8f559..aa9c437 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -117,7 +117,9 @@
//鑾峰彇鍙傛暟
var workcode = ""; //宸ュ崟鍙�
var HSourceID = ""; //璧勬簮ID
-
+ var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
+ var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+ var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -137,6 +139,9 @@
workcode = data[0].workcode;
HSourceID = data[0].HSourceID;
HSourceName = data[0].HSourceName;
+ HICMOInterID = data[0].HICMOInterID;
+ HICMOEntryID = data[0].HICMOEntryID;
+ HMaker = data[0].HMaker;
}
layui.config({
@@ -162,7 +167,7 @@
,cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200}
+ , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200}
, { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200}
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
@@ -196,7 +201,9 @@
//鏈夋簮鍗曟柊澧�
if (Type == 2)
{
- sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "'";
+ sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null"?0: HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
+ SchWhere = sWhere;
+ console.log(sWhere);
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESProductReportBillList',
@@ -211,6 +218,7 @@
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
+ sWhere = "";
}, error: function () {
layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -225,12 +233,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ var InterID = data[0].HInterID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID },
success: function (result) {
if (result.count == 1) {
@@ -316,6 +324,8 @@
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var Part = $("#Part").val(); //鐗╂枡淇℃伅
var Source = $("#Source").val(); //璧勬簮
+ sWhere += SchWhere;
+ console.log(sWhere);
if (HDate) {
sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
}
@@ -333,7 +343,7 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Sc_ICMOReportBill/DeltetICMOReportBill',
+ url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESProductReportBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
--
Gitblit v1.9.1