From 87110c04df904eb4947587a34f3fc5a1eb45eb7e Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 12 十月 2025 16:21:11 +0800
Subject: [PATCH] 入库单据开发导入入库单功能；
---
HTML/views/ASNSetting/ArrivalNotice.html | 164 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 147 insertions(+), 17 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 67fc0aa..da7278e 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -95,12 +95,12 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!--JC26-->
+ <!--JC34-->
<option value="0">鎴愬搧鍏ュ簱</option>
- <option value="1">閲囪喘鍏ュ簱</option>
- <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
<option value="3">閫�璐у叆搴�</option>
<option value="4">浣欐枡閫�鍥炲叆搴�</option>
+ <option value="8">鐢熶骇閫�鏂欏叆搴�</option>
</select>
</div>
</div>
@@ -234,6 +234,7 @@
case "2" : html = `涓棿鍝佸叆搴揱; break;
case "3" : html = `閫�璐у叆搴揱; break;
case "4" : html = `浣欐枡閫�鍥炲叆搴揱; break;
+ case "8" : html = `鐢熶骇閫�鏂欏叆搴揱; break;
default : break;
}
@@ -290,11 +291,11 @@
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
<i class="layui-icon"></i>娣诲姞
</button>
+ <button style="margin-right: 5px;" id="daoru" class="layui-btn layui-btn-sm layuiadmin-btn-list DaoRuClass" lay-event="import" >
+ <i class="layui-icon"></i>瀵煎叆
+ </button>
</script>
- <!-- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
- <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
- } -->
+
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
console.log(d);
@@ -302,8 +303,12 @@
if(d.Status == "0"){
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
+
}
-
+ if((d.AsnType =="1" || d.AsnType == "4") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
+ }
return html;
}
@@ -397,11 +402,14 @@
<script>
var uid = $.cookie('userId');
+ layui.extend({
+ excel: '../../layuiadmin/layui/layui_exts/excel' // {/}鐨勬剰鎬濆嵆浠ｈ〃閲囩敤鑷湁璺緞锛屽嵆涓嶈窡闅� base 璺緞
+ })
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'laypage', 'layer', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'laypage', 'layer', 'laydate', 'upload', 'excel'], function () {
var doing = true;
@@ -409,6 +417,8 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+
+ var upload = layui.upload;
laydate = layui.laydate;
@@ -543,7 +553,7 @@
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime2' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 150, },
{ field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 150, templet: '#templetUpdateTime3' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 150, align: 'left', toolbar: '#toolbarDemoList', "disabled": true }
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 170, align: 'left', toolbar: '#toolbarDemoList', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -589,8 +599,128 @@
},
cols: colsJson2
});
+
+ //缁戝畾瀵煎叆
+ upload.render({
+ elem: '#daoru' //缁戝畾鍏冪礌
+ , url: '' //涓婁紶鎺ュ彛
+ , auto: false //鏄惁閫夊畬鏂囦欢鍚庤嚜鍔ㄤ笂浼犮�傚鏋滆瀹� false锛岄偅涔堥渶瑕佽缃� bindAction 鍙傛暟鏉ユ寚鍚戜竴涓叾瀹冩寜閽彁浜や笂浼�
+ , exts: 'slx|excel|xlsx' //鍏佽涓婁紶鐨勬枃浠跺悗缂�
+ , accept: 'file' //鎸囧畾鍏佽涓婁紶鏃舵牎楠岀殑鏂囦欢绫诲瀷
+ //, bindAction: '#daoru' //鎸囧悜涓�涓寜閽Е鍙戜笂浼�
+ , choose: function (obj) {// 閫夋嫨鏂囦欢鍥炶皟
+ console.log(obj);
+ var files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ var fileArr = Object.values(files);// 娉ㄦ剰杩欓噷鐨勬暟鎹渶瑕佹槸鏁扮粍锛屾墍浠ラ渶瑕佽浆鎹竴涓�
+ console.log(fileArr)
+ // 鐢ㄥ畬灏辨竻鐞嗘帀锛岄伩鍏嶅娆￠�変腑鐩稿悓鏂囦欢鏃跺嚭鐜伴棶棰�
+ for (var index in files) {
+ console.log(index);
+ if (files.hasOwnProperty(index)) {
+ delete files[index];
+ }
+ }
+ console.log("abs");
+ uploadExcel(fileArr); // 濡傛灉鍙渶瑕佹渶鏂伴�夋嫨鐨勬枃浠讹紝鍙互杩欐牱鍐欙細 uploadExcel([files.pop()])
+ }
+ , done: function (res) {
+ console.log(res);
+ //涓婁紶瀹屾瘯鍥炶皟
+ }
+ , error: function (res) {
+ console.log(res);
+ //璇锋眰寮傚父鍥炶皟
+ }
+ });
});
//#endregion
+ }
+
+ // 瀵煎叆鍏ュ簱鍗曟嵁
+ function uploadExcel(files) {
+ var noticeList = [];
+ try {
+ var excel = layui.excel;
+ excel.importExcel(files, {
+ // 璇诲彇鏁版嵁鐨勫悓鏃舵⒊鐞嗘暟鎹�
+ fields: {
+ 'SkuNo': 'A', //鐗╂枡鍙�
+ 'SkuName': 'B', //鐗╂枡鍚嶇О
+ 'Qty': 'C', //鏁伴噺
+ 'LotNo': 'D', //鎵规
+ 'LotText': 'E', //鎵规鎻忚堪
+ 'SupplierLot': 'F', //渚涜揣鎵规
+ 'Lot1': 'G', //鐢熶骇鏃ユ湡
+ 'Lot2': 'H', //杩囨湡鏃ユ湡
+ 'CustomerNo': 'I', //渚涘簲鍟嗙紪鐮�
+ 'CustomerName': 'J', //渚涘簲鍟嗗悕绉�
+ }
+ },
+ function (data) {
+ console.log(data);
+ // var arr = new Array();
+ //excel绗竴琛屼笉璇诲彇銆佽缃负鏍囬
+ for (i = 1; i < data[0].Sheet1.length; i++) {
+ var noticeDetailList = [];
+ var Qty = 0;
+ if (data[0].Sheet1[i].Qty) {
+ Qty = parseFloat(data[0].Sheet1[i].Qty);
+ }
+ var noticeDetail={
+ SkuNo: data[0].Sheet1[i].SkuNo.toString(),
+ SkuName: data[0].Sheet1[i].SkuName.toString(),
+ Qty: Qty,
+ LotNo: data[0].Sheet1[i].LotNo.toString(),
+ LotText: data[0].Sheet1[i].LotText,
+ SupplierLot: data[0].Sheet1[i].SupplierLot.toString(),
+ Lot1: data[0].Sheet1[i].Lot1,
+ Lot2: data[0].Sheet1[i].Lot2,
+
+ };
+ noticeDetailList.push(noticeDetail);
+ var notice = {
+ Type:'1',
+ CustomerNo: data[0].Sheet1[i].CustomerNo.toString(),
+ CustomerName: data[0].Sheet1[i].CustomerName.toString(),
+ AsnDetail:noticeDetailList
+ };
+ noticeList.push(notice);
+ }
+ var param = {
+ "ListArrivalNotice": noticeList,
+ }
+ console.log('param:'+param)
+ layer.load();//鎵撳紑loading
+ sendData(IP + "/BllAsn/ImportArrivalNotice", param, 'post', function (res) {
+ console.log(res);
+ layer.closeAll(); //鍏抽棴loading
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ if (res.msg == undefined) {
+ layer.msg("瀵煎叆鏁版嵁鏍煎紡鏈夎锛�", {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { refreshTable(); doing = true });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { refreshTable(); doing = true });
+ }
+ }
+ });
+ });
+ } catch (e) {
+ layer.alert(e.message);
+ }
+
}
function setRight() {
@@ -602,7 +732,7 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
- //$(".addLabelClass").hide(); //鐢熸垚鏍囩
+ $(".addLabelClass").hide(); //鐢熸垚鏍囩
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
@@ -643,11 +773,11 @@
$(".checkClass").show();
});
}
- // if (res.data[k].MenuName == "鐢熸垚鏍囩") {
- // $(function () {
- // $(".addLabelClass").show();
- // });
- // }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function () {
+ $(".addLabelClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
@@ -884,7 +1014,7 @@
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 B2025080501000035 tuopan T2500037
}, function () { doing = true });
}
});
--
Gitblit v1.8.0