From 4613a660f78d469a403e81d659fd7d70db04d0cc Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 四月 2023 13:56:01 +0800
Subject: [PATCH] 界面优化
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 22 +
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html | 10
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 25 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Check_New.html | 41 +-
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 17
WebTM/views/领料发货/委外补料/Kf_EntrustReplenishOutBill_Check_New.html | 15
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 12
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html | 19 +
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html | 8
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html | 22
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 8
WebTM/views/index.html | 2
WebTM/views/仓存管理/条码库存/KF_ICInventoryByMaterID.html | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 4
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 27 +
WebTM/views/领料发货/生产补料/Kf_MateReplenishOutBill_Check_New.html | 37 +-
WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html | 19
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 13
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 8
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html | 6
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html | 2
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Check.html | 22 +
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html | 22 +
WebTM/views/PublicPage/HSourceReportHtml.html | 86 ++++++
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html | 27 +
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html | 27 +
WebTM/views/生产管理/生产装箱单/Sc_PackUnionBill_Fast.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 4
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html | 27 +
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 4
WebTM/views/验收入库/产品入库/Kf_ProductInBackBill.html | 19
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Check_New.html | 41 +-
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 84 +++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 44 ++-
35 files changed, 447 insertions(+), 287 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 698a19b..769f728 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -33,13 +33,22 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
- </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="PartNumber" id="PartNumber" style="width:190px;">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
</div>
</div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -55,6 +64,14 @@
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
+ </div>
+ </div>
+
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -143,6 +160,11 @@
var HModName = "";
var option = [];
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ var HDeptID = 0;
+
+ var params = getUrlVars();
+ var HDeptID = params[params[0]];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -158,6 +180,31 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
+
+ //鑾峰彇閮ㄩ棬鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴閮ㄩ棬</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+
+ }
+ $("#HDeptName").append(HDeptName);
+ if (!isNaN(HDeptID)) {
+ $("#HDeptName").val(HDeptID);
+ }
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -323,6 +370,7 @@
var HBillNo = $("#HBillNo").val();//鍗曟嵁缂栧彿
var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
+ var HDeptName = $("#HDeptName").val();//閮ㄩ棬
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -347,7 +395,10 @@
}
sWhere += " and " + ColName + " " + com;
}
-
+ //浼犻�掔殑鍙傛暟涓嶄负NAN
+ if (!isNaN(HDeptID) && HDeptName == 0) {
+ HDeptName = HDeptID;
+ }
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
@@ -358,6 +409,9 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
}
return sWhere;
break;
@@ -371,6 +425,9 @@
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
}
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
return sWhere;
break;
case '閲囪喘璁㈠崟':
@@ -382,6 +439,9 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
}
return sWhere;
break;
@@ -395,6 +455,9 @@
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
}
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
return sWhere;
break;
case '濮斿璁㈠崟':
@@ -406,6 +469,9 @@
}
if (PartName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
}
return sWhere;
break;
@@ -557,6 +623,7 @@
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#PartNumber").val("");//鐗╂枡缂栫爜
$("#PartName").val("");//鐗╂枡鍚嶇О
+ $("#HDeptName").val("");//鍗曟嵁鍙�
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -580,6 +647,17 @@
}
//#endregion
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//#endregion
//#endregion
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
index 2c54e7f..760a84e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
@@ -18,19 +18,23 @@
.layui-col-xs4 {
width: 12.333333%
}
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇缁勬墭鍗�</span>
</div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-form-item" style="padding:10px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs4">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:50px;padding-left:0px;">鎵樻潯鐮�</label>
</div>
<div class="layui-col-xs8">
@@ -41,10 +45,10 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-form-item" style="padding:10px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:50px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
@@ -91,7 +95,7 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<div class="layui-row">
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">鎻愪氦</button>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 23b8ae4..c6010b7 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -210,7 +210,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曠淮鎶�</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd>
- <dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>
+ <!--<dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>-->
<dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
<dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index bfd5970..60b017a 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -18,7 +18,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩存帴璋冩嫧鍗�</span>
@@ -93,13 +93,13 @@
<div class="layui-form-item" style="padding:0px;margin:0px;">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs8">
<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
<input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs2">
<button type="button" id="HFIFOWHID-BT" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
</div>
</div>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
index 665ff43..0fefcdd 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
@@ -241,16 +241,19 @@
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
- } else {
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ }else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1207'
$.ajax(
{
@@ -291,7 +294,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID;
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
@@ -397,14 +400,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
index 4f093d6..1b72e4f 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockOutBill_Fast.html"
@@ -17,7 +17,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>>鍒嗘寮忚皟鍑哄崟</span>
@@ -96,7 +96,7 @@
<input type="hidden" name="HDBFXID" id="HDBFXID" lay-verify="HDBFXID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" id="HDBFXID-BT" lay-submit="" class="layui-btn" lay-filter="HDBFXID-BT">...</button>
+ <button type="button" id="HDBFXID-BT" lay-submit="" class="layui-btn" lay-filter="HDBFXID-BT" style="width:65px;">...</button>
</div>
</div>
</div>
@@ -110,7 +110,7 @@
<input type="hidden" name="HCHLXID" id="HCHLXID" lay-verify="HCHLXID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" id="HCHLXID-BT" lay-submit="" class="layui-btn" lay-filter="HCHLXID-BT">...</button>
+ <button type="button" id="HCHLXID-BT" lay-submit="" class="layui-btn" lay-filter="HCHLXID-BT" style="width:65px;">...</button>
</div>
</div>
</div>
@@ -119,7 +119,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
</div>
- <div class="layui-col-xs8">
+ <div class="layui-col-xs6">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
index c93eacf..8788705 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
@@ -13,7 +13,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐗╂枡搴撳瓨鏌ヨ</span>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 1c153b2..87a640b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -29,14 +29,11 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
-
- <!--鍔ㄦ�佹覆鏌撹溅闂�-->
- </select>
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鐘舵��</label>
<div class="layui-input-block">
@@ -61,22 +58,19 @@
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="鍏ㄩ儴">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
- <option value="鏈笅鎺�" selected="selected">鏈笅鎺�</option>
+ <option value="鏈笅鎺�" selected="selected">鏈笅鎺�</option>
</select>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -88,7 +82,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
<div class="layui-colla-content">
<div class="layui-row">
@@ -146,6 +140,19 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate1">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -531,6 +538,7 @@
var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
var HSF = $("#HSF").val();//鍗曟嵁绫诲瀷
+ var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -602,6 +610,9 @@
}
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
+ }
+ if (HModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
//if (HSF) {
// sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like '%" + HSF + "%'";
@@ -621,6 +632,7 @@
$("#HMaterName").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
$("#HStatus").val("");//鍗曟嵁鍙�
+ $("#HModel").val("");//瑙勬牸鍨嬪彿
$("#btnSearch").click();
$("#ColContent").val("");
$("#ColName").val("0");
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_ICMOReportBill_FastNew.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_ICMOReportBill_FastNew.html"
index 63b7280..53503d1 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_ICMOReportBill_FastNew.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_ICMOReportBill_FastNew.html"
@@ -17,8 +17,8 @@
</head>
<body>
<div class="layui-fluid" style="padding:0">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇姹囨姤鍗�</span>
@@ -107,7 +107,7 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:45px;padding-left:0px;">鐝粍</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">鐝粍</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input" disabled="disabled">
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html"
index aef58ea..dbb311f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html"
@@ -13,7 +13,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇瑁呯鍗�</span>
@@ -42,7 +42,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鎷栨潯鐮�</label>
</div>
- <div class="layui-col-xs8">
+ <div class="layui-col-xs6">
<input type="text" name="HTBarCode" id="HTBarCode" lay-verify="HTBarCode" autocomplete="off" class="layui-input">
</div>
</div>
@@ -50,7 +50,7 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index da9a894..d986752 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -638,7 +638,7 @@
data: { "HBillType": '3301' },
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").attr("readOnly", false);
+ $("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
@@ -1154,7 +1154,7 @@
$("#HUnitID").val(checkStatus.data[0].HUnitID);//璁￠噺鍗曚綅id
$("#HUnitName").val(checkStatus.data[0].HUnitName);//璁￠噺鍗曚綅鍚嶇О
if ($("#HName").val() == "") {
- $("#HName").val(checkStatus.data[0].HName);
+ $("#HName").val(checkStatus.data[0].HNumber + '/' + checkStatus.data[0].HName + '/' + checkStatus.data[0].HModel);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check.html"
index 26671f9..2c5e280 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check.html"
@@ -21,26 +21,34 @@
</head>
<body>
<div class="layui-fluid" style="padding:0">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍏朵粬鍑哄簱鏍￠獙</span>
- </div>
+ </div>
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs5">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index eb99de8..03cb9d3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -20,9 +20,9 @@
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍏朵粬鍑哄簱鍗�</span>
@@ -52,11 +52,11 @@
</div>
<div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">閫夋嫨婧愬崟</li>
- <li lay-id="2">琛ㄥご淇℃伅</li>
- <li lay-id="3">鏄庣粏淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
+ <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
<li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
- <li lay-id="5">鍚堣淇℃伅</li>
+ <li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--閫夋嫨婧愬崟-->
@@ -106,7 +106,7 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs4">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
<div class="layui-col-xs8">
<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
@@ -290,6 +290,7 @@
<source src="../../video/success.wav" type="audio/ogg">
</audio>
</div>
+ </div>
</form>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index 934666a..33873e1 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -215,9 +215,20 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1206'
$.ajax(
{
@@ -257,7 +268,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var sInterID = data[0].HInterID;
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
$.ajax(
{
type: "Get",
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html"
index ecf86a2..b2edddc 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html"
@@ -16,19 +16,23 @@
.layui-col-xs4 {
width: 12.333333%
}
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿棰嗘枡鏍￠獙</span>
</div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs4">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
@@ -38,22 +42,22 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
</div>
</div>
- </div>
+ </div>
<div class="layui-tab" lay-filter="tab-Kf_EntrustOutBillCheck">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">琛ㄥご淇℃伅</li>
- <li lay-id="2">鐗╂枡淇℃伅</li>
- <li lay-id="3">鍚堣淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -123,7 +127,7 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<div class="layui-row">
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
@@ -140,6 +144,7 @@
</div>
</div>
</div>
+ </div>
</form>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index df80a5e..a4c4693 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -19,7 +19,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿鍑哄簱鍗�</span>
@@ -292,7 +292,7 @@
<!--鏃ュ織-->
<div class="layui-tab-item">
- <textarea id="rizhi" style="height: 200px;width: 100%;margin-left: 1%;"></textarea>
+ <textarea id="rizhi" style="height: 200px;width: 98%;margin-left: 1%;"></textarea>
</div>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html"
index 47441aa..84624b0 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html"
@@ -19,9 +19,9 @@
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 1px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿琛ユ枡鏍￠獙</span>
@@ -51,9 +51,9 @@
</div>
<div class="layui-tab" lay-filter="tab-Kf_EntrustReplenishOutBillCheck">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">琛ㄥご淇℃伅</li>
- <li lay-id="2">鐗╂枡淇℃伅</li>
- <li lay-id="3">鍚堣淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -123,7 +123,7 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<div class="layui-row">
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
@@ -140,6 +140,7 @@
</div>
</div>
</div>
+ </div>
</form>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index 9a6d141..a42f5be 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -24,7 +24,7 @@
border-radius: 4px;
}
- .title {
+ /*.title {
border-left: 4px solid #1492ff;
padding-left: 6px;
margin: 20px 10px 4px;
@@ -60,67 +60,83 @@
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
- }
+ }*/
- .layui-form-label {
+ /* .layui-form-label {
padding: 9px 5px;
width: 85px;
- }
+ }*/
- .layui-input-block {
+ /* .layui-input-block {
margin-left: 85px;
min-height: 36px;
+ }*/
+
+ .layui-table-cell {
+ height: auto;
+ white-space: normal;
+ }
+
+ .layui-col-xs8 {
+ width: 55.666667%;
}
</style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 15px;background-color: #efefef;">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
<div class="maintitle">鍒拌揣纭</div>
- <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉＄爜</label>
- <div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input"><!--lay-verify="required"-->
- <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;"><span style="color:red;">*</span>鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin">纭畾</button>
</div>
</div>
- </div>
-
+ </div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
- <li class="layui-this">琛ㄥご淇℃伅</li>
- <li>鏄庣粏淇℃伅</li>
+ <li style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+ <li style="padding:1px;">鏄庣粏淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
- <input type="hidden" class="layui-input" name="HInterID" id="HInterID" style="width:100px">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID" autocomplete="off" class="layui-input">
+ </div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">渚涘簲鍟�:</label>
- <div class="layui-input-block">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" disabled="disabled">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">渚涘簲鍟�</label>
</div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
+ </div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
- <div class="layui-input-block">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -199,7 +215,7 @@
if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
table.render(option);
- break;
+ return;
}
layer.close(index);
//$.ajax({
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
index 848e5e1..7a51774 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
@@ -19,14 +19,14 @@
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇琛ユ枡鏍￠獙</span>
</div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs4">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
@@ -37,23 +37,23 @@
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
- </div>
+ </div>
<div class="layui-tab" lay-filter="tab-Kf_MateReplenishOutBillCheck">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">琛ㄥご淇℃伅</li>
- <li lay-id="2">鐗╂枡淇℃伅</li>
- <li lay-id="3">鍚堣淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -123,7 +123,7 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<div class="layui-row">
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
@@ -140,6 +140,7 @@
</div>
</div>
</div>
+ </div>
</form>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
index 8c79e33..f1fc22c4 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
@@ -35,17 +35,20 @@
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>閿�鍞嚭搴�(绾㈠瓧)</span>
+ </div>
<div class="layui-tab" lay-filter="tab-SellOutBackBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">婧愬崟淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
- <li lay-id="3">鐗╂枡娓呭崟</li>
- <li lay-id="4">鏄庣粏娓呭崟</li>
- <li lay-id="5">鏃ュ織</li>
+ <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+ <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
+ <li lay-id="5" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
index 1e77dea..0926da4 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_New.html"
@@ -16,19 +16,23 @@
.layui-col-xs4 {
width: 12.333333%
}
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>閿�鍞嚭搴撴牎楠�</span>
</div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs4">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
@@ -38,22 +42,22 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
</div>
</div>
- </div>
+ </div>
<div class="layui-tab" lay-filter="tab-Kf_SellOutBillCheck">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">琛ㄥご淇℃伅</li>
- <li lay-id="2">鐗╂枡淇℃伅</li>
- <li lay-id="3">鍚堣淇℃伅</li>
+ <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -123,7 +127,7 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<div class="layui-row">
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
@@ -140,6 +144,7 @@
</div>
</div>
</div>
+ </div>
</form>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 02cbc2f..8426f0b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -19,7 +19,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>閿�鍞嚭搴撳崟</span>
@@ -103,13 +103,13 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs8">
<input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
<input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
index f374852..e110975 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
@@ -210,16 +210,19 @@
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
- } else {
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ }else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1205'
$.ajax(
{
@@ -258,7 +261,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -364,14 +367,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
index 4304c03..274148a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
@@ -17,7 +17,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇閫�鏂欏崟</span>
@@ -86,7 +86,7 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">閰嶅鏁伴噺</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">閰嶅鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HPPQty" id="HPPQty" lay-verify="HPPQty" autocomplete="off" class="layui-input">
@@ -96,13 +96,13 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs8">
<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
<input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 8d9f0f4..6f82bf0 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -18,7 +18,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>棰嗘枡鍑哄簱鍗�</span>
@@ -87,7 +87,7 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">閰嶅鏁伴噺</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">閰嶅鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HPPQty" id="HPPQty" lay-verify="HPPQty" autocomplete="off" class="layui-input">
@@ -97,14 +97,14 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs8">
<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
<input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT" style="width:65px;">...</button>
</div>
</div>
</div>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
index 068d32b..db6d2f6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
@@ -248,8 +248,8 @@
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1204'
$.ajax(
{
@@ -290,7 +290,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID;
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
@@ -339,14 +339,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
index 5c75bc9..df6c5b1 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBackBill.html"
@@ -25,17 +25,20 @@
}
</style>-->
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>浜у搧閫�搴�</span>
+ </div>
<div class="layui-tab" lay-filter="tab-ProductlnBackBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">婧愬崟淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
- <li lay-id="3">鐗╂枡娓呭崟</li>
- <li lay-id="4">鏄庣粏娓呭崟</li>
- <li lay-id="5">鏃ュ織</li>
+ <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+ <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
+ <li lay-id="5" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 271535f..70370e5 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -19,7 +19,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>浜у搧鍏ュ簱鍗�</span>
@@ -210,13 +210,6 @@
</div>
</div>
</div>
-
-
-
-
-
-
-
<div class="layui-tab-item">
<!--<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
@@ -250,7 +243,7 @@
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜鏁�</label>
+ <label class="layui-form-label" style="width:50px;padding-left:0px;">鏉＄爜鏁�</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HBarCodeQtys" id="HBarCodeQtys" lay-verify="HBarCodeQtys" autocomplete="off" class="layui-input">
@@ -260,7 +253,7 @@
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鎬绘暟閲�</label>
+ <label class="layui-form-label" style="width:50px;padding-left:0px;">鎬绘暟閲�</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" autocomplete="off" class="layui-input">
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
index ca2a01e..0a2f3f5 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
@@ -314,16 +314,19 @@
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1202'
$.ajax(
{
@@ -365,7 +368,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
@@ -484,14 +487,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 7c77178..df5a853 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -12,12 +12,16 @@
.layui-col-xs4 {
width: 12.333333%
}
+
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
</style>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-fluid" style="padding: 0px">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍏朵粬鍏ュ簱鍗�</span>
@@ -27,7 +31,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
- <div class="layui-col-xs5">
+ <div class="layui-col-xs8">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
@@ -39,7 +43,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
- <div class="layui-col-xs5">
+ <div class="layui-col-xs8">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
</div>
@@ -48,10 +52,10 @@
<div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
- <li lay-id="1">婧愬崟淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
- <li lay-id="3">鐗╂枡娓呭崟</li>
- <li lay-id="4">鏃ュ織</li>
+ <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+ <li lay-id="4" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index 6cf9266..af60c7e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -141,14 +141,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 100 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
@@ -240,16 +240,19 @@
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
- } else {
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ }else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1203'
$.ajax(
{
@@ -291,7 +294,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
index 342ae2c..73ea329 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill.html"
@@ -13,7 +13,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>澶栬喘鍏ュ簱鍗�(绾㈠瓧)</span>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 80da64a..af89da4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -21,7 +21,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>澶栬喘鍏ュ簱鍗�</span>
@@ -238,7 +238,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
index 12daf65..5cabf2e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
@@ -213,17 +213,20 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
- var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID
- var sBillNo = data[0].HBillNo
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1201'
$.ajax(
{
@@ -262,7 +265,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID
+ var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
@@ -338,14 +341,14 @@
, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
, cols: [[
{ type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
]]
, height: 500
, done: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 12dccbc..9148032 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -18,7 +18,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿鍏ュ簱鍗�</span>
--
Gitblit v1.9.1