From bc5fe4a7797294734eb5927be6135a42175e7aae Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 16 六月 2021 21:21:51 +0800
Subject: [PATCH] 增加附件列表功能，以及上传附件，下载附件功能。
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 258 ++++++++++++++++++++++++++++++++++++++------------
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 10 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
3 files changed, 200 insertions(+), 70 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index a3e9353..e0dadd5 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -23,11 +23,11 @@
</File>
<File Include="bin/WebTM.dll">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>06/15/2021 15:33:55</publishTime>
+ <publishTime>06/16/2021 21:19:34</publishTime>
</File>
<File Include="bin/WebTM.pdb">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>06/15/2021 15:33:55</publishTime>
+ <publishTime>06/16/2021 21:19:34</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -2684,12 +2684,12 @@
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
<publishTime>04/25/2021 08:45:34</publishTime>
<publishTime>04/25/2021 08:45:34</publishTime>
- <publishTime>06/15/2021 15:10:58</publishTime>
+ <publishTime>06/16/2021 21:19:24</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
<publishTime>04/25/2021 08:45:34</publishTime>
<publishTime>04/25/2021 08:45:34</publishTime>
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>06/16/2021 21:17:02</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -3012,7 +3012,7 @@
</File>
<File Include="Web.config">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>06/15/2021 15:34:01</publishTime>
+ <publishTime>06/16/2021 21:19:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 247d475..771964e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -420,13 +420,30 @@
<div class="title">闄勪欢淇℃伅</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <!--<div class="layui-upload">
<button type="button" class="layui-btn" id="UploadPic">澶氬浘鐗囦笂浼�</button>
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
棰勮鍥撅細
<div class="layui-upload-list" id="PicName"></div>
<div class="layui-upload-list" id="PicName2"></div>
</blockquote>
- </div>
+ </div>-->
</div>
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
@@ -471,6 +488,7 @@
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var HBillNo = params[params[1]]; //鑾峰彇鍗曟嵁鍙�
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
@@ -493,6 +511,8 @@
RoadBillMain(linterid);
//RoadBillSub(linterid);
}
+
+
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
@@ -653,39 +673,39 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
- //var oMain = data.field;
- //var index = layer.load();
- //$.ajax({
- // type: "POST",
- // url: GetWEBURL() + "/Cj_StationOutBill/AddBill",
- // //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
- // async: true,
- // data: {"oMain": oMain},
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) {
- // //layer.confirm(data.Message, {
- // // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // // btn2: function () {
- // // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // // parent.location.href = "../../../views/index.html"
- // // }//鍏抽棴
- // //}, function () { window.location.reload(); });//鏂板
- // layer.close(index);
- // layer.msg("鎻愪氦鎴愬姛");
- // }
- // else {
- // layer.close(index);
- // layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.close(index);
- // layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- //});
+ var tableData = data.field;
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationOutBill/AddBill",
+ //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ async: true,
+ data: {"oMain": oMain},
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.confirm(data.Message, {
+ // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ // btn2: function () {
+ // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ // parent.location.href = "../../../views/index.html"
+ // }//鍏抽棴
+ //}, function () { window.location.reload(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
//閫夋嫨鐢熶骇鐝粍寮圭獥
@@ -866,40 +886,150 @@
layer.msg('绂佹閫夋嫨');
});
+
+
+
//澶氬浘鐗囦笂浼�
- upload.render({
- elem: '#UploadPic'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile"
- //, url: 'https://httpbin.org/post' //鏀规垚鎮ㄨ嚜宸辩殑涓婁紶鎺ュ彛
- ,accept: 'file', //鎸囧畾鍏佽涓婁紶鐨勬枃浠剁被鍨�
- multiple: true, //鏄惁鍏佽澶氭枃浠朵笂浼�
- number: 5, //鏈�澶т笂浼犳暟閲�
- //size: 300, //鏈�澶ф枃浠跺ぇ灏忥紝鍗曚綅k
- //field: 'file', //浼犲埌鍚庡彴鐨勫瓧娈靛悕,榛樿file
- auto: false,//閫夋嫨鏂囦欢鍚庝笉鑷姩涓婁紶
- bindAction: '#Saver', //缁戝畾鐪熸鐨勪笂浼犳寜閽�
- data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(),"HUserName":sessionStorage["HUserName"]},
- choose: function (obj) { //閫夋嫨鏂囦欢鍚庣殑鍥炶皟鍑芥暟
- //var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
- //棰勮鏈湴鏂囦欢绀轰緥锛�
- obj.preview(function (index, file, result) {
- $('#PicName').append('<img src="' + result + '" alt="' + file.name + '" width="200px;">')
- });
- }
- //, before: function (obj) {
- // //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- // obj.preview(function (index, file, result) {
- // $('#PicName').append('<div class="layui-inline"><img src="' + result + '" alt="' + file.name + '" class="layui-upload-img"><br/>' + file.name + '</div>');
- // });
- //}
- , done: function (res) {
- layer.msg(res.Message);
- console.log(res);
- }
- });
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(3).html(''); //娓呯┖鎿嶄綔
+ //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+ });
+
+ //鑾峰彇缂栬緫鏃�,宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ if (HBillNo != null || HBillNo != undefined)
+ {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ type: "GET",
+ data: { "HBillNo": HBillNo },
+ success: function (data1) {
+ if (data1.count == 1) {
+ console.log(data1.data);
+ var index = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ var tr = $(['<tr id="upload-' + i + '">'
+ , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+ , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+ , '<td>' + data1.data[i].HFileName + '</td>'
+ , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+ , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+ , '<td style="display:none">' + data1.data[i].url + '</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ $('#ProImgByList').append(tr);
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
//浠ヤ笂涓簂ayui妯″潡
});
+
+ function toManager(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+ var HItemID = $("#ProImgByList tr:eq(" + (rows-1) + ") td:eq(0)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+ var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+ var HFileName = $("#ProImgByList tr:eq(" + (rows - 1)+ ") td:eq(2)").html();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+ //鍒犻櫎宸蹭笂浼犳枃浠�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+ type: "GET",
+ data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ $("#ProImgByList tr").eq((rows - 1)).remove();
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
+ /*window.location.href = url;*/
+ window.open(url)
+ }
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) {
$("#HGroupName").val(obj[0].鐝粍);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 5e465c3..d2c8633 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -190,7 +190,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['Cj_StationOutBill.html?linterid=' + data.HInterID, 'yes']
+ , content: ['Cj_StationOutBill.html?linterid=' + data.hmainid + '&HBillNo=' + data.HBillNo, 'yes']
, resize: false
, cancel: function () {
$(".layui-btn").removeClass("layui-btn-disabled");
--
Gitblit v1.9.1