From e41d9b37caa87f71e2dfeb27b80785756887a805 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 17 十月 2025 13:41:35 +0800
Subject: [PATCH] 库存转移模块样式调整；异常反馈单去除日期组件初始化，因为会影响到日期字段的赋值；车间定位报表添加三种操作类型进行查询
---
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 4 ++--
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 2 +-
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html | 1 -
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html | 24 ++++++++++++------------
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html | 3 +++
WebTM/views/WMS扫码模块/找货下架单/Kf_MaterialLowerBill_PDA.html | 17 ++++++++---------
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 2 +-
7 files changed, 27 insertions(+), 26 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 88fcdba..d6d63a6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -49,15 +49,15 @@
<!-- 杞Щ妯″紡閫夋嫨鎸夐挳 -->
<div class="transfer-mode-buttons">
+ <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱缁戝畾</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">灏忚溅杞Щ</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">浠撳簱杞Щ</button>
- <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱缁戝畾</button>
</div>
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">灏忚溅淇℃伅1</label>
+ <label class="layui-form-label" style="width:70px;padding-left:0px;">灏忚溅淇℃伅1</label>
</div>
<div class="layui-col-xs9">
<input type="text" name="HCarBarCode" id="HCarBarCode" lay-verify="HCarBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -65,7 +65,7 @@
</div>
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">灏忚溅淇℃伅2</label>
+ <label class="layui-form-label" style="width:70px;padding-left:0px;">灏忚溅淇℃伅2</label>
</div>
<div class="layui-col-xs9">
<input type="text" name="HCarBarCode_2" id="HCarBarCode_2" lay-verify="HCarBarCode_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -74,7 +74,7 @@
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
<div class="layui-col-xs6">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">璋冨嚭<br/>浠撳簱</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -86,7 +86,7 @@
</div>
<div class="layui-col-xs6">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭浠撲綅</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">璋冨嚭<br/>浠撲綅</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -101,7 +101,7 @@
<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
<div class="layui-col-xs6">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆浠撳簱</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">璋冨叆<br/>浠撳簱</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HWHName_2" id="HWHName_2" lay-verify="HWHName_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -113,7 +113,7 @@
</div>
<div class="layui-col-xs6">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆浠撲綅</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">璋冨叆<br/>浠撲綅</label>
</div>
<div class="layui-col-xs6">
<input type="text" name="HStockPlaceName_2" id="HStockPlaceName_2" lay-verify="HStockPlaceName_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -127,10 +127,10 @@
<div class="layui-row">
<div class="layui-col-xs6">
<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;">鐗╂枡鏉＄爜</label>
</div>
<div class="layui-col-xs9">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" style="margin-left:25px;">
</div>
</div>
</div>
@@ -199,7 +199,7 @@
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">搴撳瓨杞Щ</button>
- <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ <!--<button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>-->
<button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
<button type="button" lay-submit="" lay-filter="cmdBind" class="layui-btn" id="cmdBind">缁戝畾</button>
</div>
@@ -258,7 +258,7 @@
//#endregion
// 鍒濆鍖栬浆绉绘ā寮�
- var currentTransferMode = 'car'; // 榛樿妯″紡锛氬皬杞﹁浆绉�
+ var currentTransferMode = 'car_warehouse'; // 榛樿妯″紡锛氬皬杞�-浠撳簱缁戝畾
setTransferMode(currentTransferMode);
// 杞Щ妯″紡鎸夐挳鐐瑰嚮浜嬩欢
@@ -366,7 +366,7 @@
}
// 璁剧疆榛樿婵�娲绘寜閽�
- $('#btnCarTransfer').addClass('layui-btn-active');
+ $('#btnCarWarehouseTransfer').addClass('layui-btn-active');
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index 2c3c7ea..5f93feb 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -605,7 +605,6 @@
return;
}
- layer.load(3);
}
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\213\346\236\266\345\215\225/Kf_MaterialLowerBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\213\346\236\266\345\215\225/Kf_MaterialLowerBill_PDA.html"
index 4438c1f..41a0a4a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\213\346\236\266\345\215\225/Kf_MaterialLowerBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\213\346\236\266\345\215\225/Kf_MaterialLowerBill_PDA.html"
@@ -186,7 +186,7 @@
</div>
<!--鐗╂枡淇℃伅-->
<div class="layui-tab-item" style="display:none;">
- <div class="layui-row" style="display:none;">
+ <div class="layui-row" style="display:none;">
<div class="layui-col-xs12" style="display:none;">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
@@ -477,7 +477,7 @@
var HMaterNumber = data.HMaterNumber; //鐗╂枡浠ｇ爜
var HMaterName = data.HMaterName; //鐗╂枡鍚嶇О
var HMaterModel = data.HMaterModel; //瑙勬牸鍨嬪彿
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
, title: '鍙婃椂搴撳瓨淇℃伅' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
@@ -506,7 +506,7 @@
HBillNo = '';
$("#HSourceBillNo").val(HSourceBillNo_Temp);
GetMeesageBySourceBillNo();
- }
+ }
else {
//鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
$.ajax({
@@ -1159,8 +1159,7 @@
function DisBillEntryList() {
$.ajax({
type: "GET",
- //url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- url: GetWEBURL() + '/WEBSController/MaterialLowerBill_MaterInv',
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
success: function (result) {
@@ -1269,7 +1268,7 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -1291,9 +1290,9 @@
FIFOListOption.cols = [columns];
FIFOListOption.data = result.data;
FIFOListOption.totalRow = true;
- table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(FIFOListOption);
-
+
}
else {
FIFOListOption.cols = [[
@@ -1314,7 +1313,7 @@
}
//#endregion
-
+
});
//浠ヤ笂涓簂ayui妯″潡
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 0cea968..94c1e30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -437,7 +437,7 @@
//#endregion
//鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
+ //set_InitFrom();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == null || OperationType == 1) {//鏃犳簮鍗�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index bab962d..3c4e4be 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -450,7 +450,7 @@
//#endregion
//鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
+ //set_InitFrom();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == null || OperationType == 1) {//鏃犳簮鍗�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index 3f15d93..5835670 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -426,7 +426,7 @@
//#endregion
//鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
+ //set_InitFrom();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == null || OperationType == 1) {//鏃犳簮鍗�
@@ -655,7 +655,7 @@
, "HSignEmpID": data[0]["HSignEmpID"]
, "HSignEmpName": data[0]["绛惧埌浜�"]
, "HSignNote": data[0]["绛惧埌纭"]
- , "HSignDate": data[0]["绛惧埌鏃堕棿"]
+ , "HSignDate": formatDate(data[0]["绛惧埌鏃堕棿"])
, "HHandleEmpID": data[0]["HHandleEmpID"]
, "HandleEmpName": data[0]["鎸囨淳澶勭悊浜�"]
, "HHandleAdvise": data[0]["澶勭悊寤鸿"]
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index a04e918..53587b8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -38,6 +38,9 @@
<option value="" selected="selected">鍏ㄩ儴</option>
<option value="1253">涓婃灦</option>
<option value="1252">涓嬫灦</option>
+ <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
+ <option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
+ <option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
</select>
</div>
</div>
--
Gitblit v1.9.1