From 7ff4b156f02d5f9ab0f02d56fd7f60e32f4ce9bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 02 九月 2025 15:06:10 +0800
Subject: [PATCH] 修改 领料出库单 毛尖/羊毛染色 允许添加子表仓库
---
WebTM/WebTM.csproj.user | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 25 +------
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 29 ++-------
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 4
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | 48 +++-------------
WebTM/views/仓存管理/委外用料单/WW_PPBomBillList.html | 8 +-
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 10 +-
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html | 10 +-
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 4
10 files changed, 41 insertions(+), 101 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 7ed83cb..8cc4879 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
index 0f98ff1..5a43bee 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
@@ -351,7 +351,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid(); //鎵ц琛ㄦ牸鍒濆鍖栨柟娉�
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(); //鎵ц鏌ヨ鏂规硶
+ // get_FastQuery(); //鎵ц鏌ヨ鏂规硶
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();//鎵ц闅愯棌鏂规硶
@@ -1133,7 +1133,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false); //寮�濮嬫椂闂村彲鑷��
$('#HEndDate').prop('disabled', false); //缁撴潫鏃堕棿鍙嚜閫�
@@ -1147,8 +1147,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";//鍦℉TML鏂囨。涓壘鍒癐D涓篐FilterScheme_Now鐨勫厓绱狅紝骞惰缃叾CSS鐨刣isplay灞炴�т负none
//鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); //璀︾ず绀� 鎺ュ彛璇锋眰澶辫触 璀︾ず鏍囧織涓�5鐨�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index e89941b..776eace 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -468,7 +468,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option)
+ // get_FastQuery(table, option)
//鍔犺浇涓氬姟鍛�
get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
@@ -1680,7 +1680,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index df1ff59..684abda 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -415,9 +415,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(1)
+ // get_FastQuery(1)
@@ -2024,7 +2024,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //get_FastQuery();
} else {
$('#HDate').prop('disabled', false);
$('#HDate1').prop('disabled', false);
@@ -2038,8 +2038,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
index 2c9930f..29580e2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
@@ -460,7 +460,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option,1)
+ // get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -1630,7 +1630,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
get_FastQuery()
- //form.render("select");
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index 1ef43e9..e62b6bc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -370,9 +370,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(1)
+ // get_FastQuery(1)
//闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
+ // DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -1355,7 +1355,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -1369,8 +1369,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index 0c4acb3..ff463f8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -461,7 +461,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option,1)
+ // get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
index 6163d4d..702e149 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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
@@ -136,21 +136,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> *
- </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly
- class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
- value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn"
- lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -307,21 +292,6 @@
</div>
</div>
<div class="layui-form-item">
- <!-- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> *
- </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly
- class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
- value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn"
- lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
- </button>
- </div>
- </div> -->
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -932,7 +902,7 @@
} else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
} else if (HMaterRuleExternType1 == "杞墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
}
//if (HMaterRuleExternType == '姣涘皷') {
// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -960,7 +930,7 @@
} else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
} else if (HMaterRuleExternType1 == "杞墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
}
}
@@ -1200,7 +1170,7 @@
} else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
} else if (HMaterRuleExternType1 == "杞墏") {
- HQty = dealDoubleToFixed(HRate * HLong * 0.001);
+ HQty = dealDoubleToFixed(HRate * HLong);
}
//if (HMaterRuleExternType == '姣涘皷') {
// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
@@ -1406,8 +1376,8 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true }
+ , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: false }
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: false }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1523,8 +1493,8 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- "HWHID": data.HWHIDMain //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ //"HWHID": data.HWHIDMain //浠撳簱ID
+ //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1534,7 +1504,7 @@
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
- ,"HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
@@ -1808,7 +1778,7 @@
} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "杞墏") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong * 0.001);
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong);
}
//if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
index 58b2b7d..b7e590b 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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
@@ -140,21 +140,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> *
- </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly
- class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
- value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn"
- lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -309,7 +294,7 @@
</div>
</div>
<div class="layui-form-item">
- <!-- <div class="layui-inline">
+ <div class="layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
@@ -323,7 +308,7 @@
style="margin-left:-9px;"></i>
</button>
</div>
- </div> -->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -1455,8 +1440,8 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true }
+ , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: false }
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: false }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1572,8 +1557,8 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- "HWHID": data.HWHIDMain //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ //"HWHID": data.HWHIDMain //浠撳簱ID
+ //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1583,7 +1568,7 @@
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
- , "HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
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_MateOutBillLEdit.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_MateOutBillLEdit.html"
index e07cf7c..d862c75 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_MateOutBillLEdit.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_MateOutBillLEdit.html"
@@ -136,21 +136,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> *
- </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly
- class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
- value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn"
- lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">瀹㈡埛<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
@@ -301,7 +286,7 @@
</div>
</div>
<div class="layui-form-item">
- <!-- <div class="layui-inline">
+ <div class="layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
@@ -310,7 +295,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div> -->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -1463,8 +1448,8 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- "HWHID": data.HWHIDMain //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ //"HWHID": data.HWHIDMain //浠撳簱ID
+ //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1474,7 +1459,7 @@
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
- , "HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
--
Gitblit v1.9.1