From 2bf4ff2ba42a6b68de0b298f9b701e6d6338dfdb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 05 十一月 2025 16:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBill_PDA.html | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
index a923508..928e87a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
@@ -477,7 +477,7 @@
$("#HStockOrgName").val(sessionStorage["Organization"]);
$("#HBillType").val("1210");
$("#HRedBlueFlag").val("false");
- if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
$("#HStockPlaceName").attr("disabled", "disabled");
@@ -656,6 +656,7 @@
if (d.data[0].HMulSourceBill == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
if (d.data[0].HDeptID != 0) {
$("#HDeptID").val(d.data[0].HDeptID);
@@ -705,8 +706,8 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HWHID").val(result.data[0].HItemID);
$("#HWHName").val(result.data[0].HName);
- $("#HStockPlaceID").val("0");
- $("#HStockPlaceName").val("");
+ $("#HStockPlaceID").val(result.data[0].HSPID);
+ $("#HStockPlaceName").val(result.data[0].HSPName);
if (result.data[0].HSPFlag == 0) {
$("#HStockPlaceName").attr("disabled", "disabled");
$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -1044,7 +1045,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1379,6 +1380,7 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
//渚涘簲鍟嗕笉鍙紪杈�
$("#HSupName").attr("disabled", "disabled");
@@ -1527,8 +1529,8 @@
if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
$("#HWHName").val(result.data.hWhNameField);
$("#HWHID").val(result.data.hWhIDField);
- $("#HStockPlaceName").val("");
- $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
if (result.data.hSPFlagField == 0) {
$("#HStockPlaceName").attr("disabled", "disabled");
$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -1589,6 +1591,7 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
//渚涘簲鍟嗕笉鍙紪杈�
$("#HSupName").attr("disabled", "disabled");
@@ -1637,6 +1640,7 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
//渚涘簲鍟嗕笉鍙紪杈�
$("#HSupName").attr("disabled", "disabled");
@@ -1707,7 +1711,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鐗╂枡浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
@@ -1804,8 +1808,8 @@
if (obj.length > 0) {
$("#HWHName").val(obj[0].HName);
$("#HWHID").val(obj[0].HItemID);
- $("#HStockPlaceName").val("");
- $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val(obj[0].HSPName);
+ $("#HStockPlaceID").val(obj[0].HSPID);
if (obj[0].HSPFlag == 0) {
$("#HStockPlaceName").attr("disabled", "disabled");
$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
--
Gitblit v1.9.1