From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
HTML/views/StatisticalReport/InventoryStatistics.html | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 878f85c..8ba163b 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -65,9 +65,9 @@
</div>
</div>
<div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
class="layui-input">
</div>
</div>
@@ -357,7 +357,7 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',totalRowText: "鍚堣:", "disabled": true},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center', "disabled": true},
{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center', "disabled": true},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center', "disabled": true},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
@@ -405,7 +405,7 @@
SkuName:SkuName, //鐗╂枡鍚嶇О
OwnerNo:OwnerNo, //璐т富缂栫爜
OwnerName:OwnerName, //璐т富鍚嶇О
- LotNo:LotNo, //鎵规鍙�
+ LotNo:LotNo, //杩涘巶缂栧彿
};
sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
console.log(res)
@@ -480,7 +480,7 @@
// align: 'center',
// }, {
// field: 'LotNo',
- // title: '鎵规鍙�',
+ // title: '杩涘巶缂栧彿',
// align: 'center',
// }, {
// field: 'Qty',
@@ -530,11 +530,11 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',width: 100,align: 'center'},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
{field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center'},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
+ {field: 'SupplierNo',title: '鐢熶骇鍟嗙紪鐮�',align: 'center'},
+ {field: 'SupplierName',title: '鐢熶骇鍟嗗悕绉�',align: 'center'},
{field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'},
{field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
{field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'},
@@ -579,7 +579,7 @@
SkuName:SkuName, //鐗╂枡鍚嶇О
OwnerNo:OwnerNo, //璐т富缂栫爜
OwnerName:OwnerName, //璐т富鍚嶇О
- LotNo:LotNo, //鎵规鍙�
+ LotNo:LotNo, //杩涘巶缂栧彿
LocatNo:LocatNo,//鍌ㄤ綅鍦板潃
PalletNo:PalletNo, //鎵樼洏鍙�
Status:Status,//搴撳瓨鐘舵��
--
Gitblit v1.8.0