From 3cd0c73d31f332a9a32a94bb0d2a75d1e99a6b42 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 四月 2024 17:48:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/Files/Material/ZY004/R-C.jpg | 0
WebTM/Files/213/铅笔2.jpg | 0
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 84 +++++++-------------
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 135 +++++++++++++++++++++++++++++++--
WebTM/Files/213/铅笔.jpg | 0
5 files changed, 157 insertions(+), 62 deletions(-)
diff --git "a/WebTM/Files/213/\351\223\205\347\254\224.jpg" "b/WebTM/Files/213/\351\223\205\347\254\224.jpg"
new file mode 100644
index 0000000..1bed35d
--- /dev/null
+++ "b/WebTM/Files/213/\351\223\205\347\254\224.jpg"
Binary files differ
diff --git "a/WebTM/Files/213/\351\223\205\347\254\2242.jpg" "b/WebTM/Files/213/\351\223\205\347\254\2242.jpg"
new file mode 100644
index 0000000..ed128a9
--- /dev/null
+++ "b/WebTM/Files/213/\351\223\205\347\254\2242.jpg"
Binary files differ
diff --git a/WebTM/Files/Material/ZY004/R-C.jpg b/WebTM/Files/Material/ZY004/R-C.jpg
new file mode 100644
index 0000000..12785ac
--- /dev/null
+++ b/WebTM/Files/Material/ZY004/R-C.jpg
Binary files differ
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 3ffa5f1..ff9bbef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -1584,19 +1584,19 @@
, uploadListIns = upload.render({
elem: '#testList'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , url: GetWEBURL() + "/Gy_Mater/UploadFile"
, accept: 'file'
, multiple: true
, auto: false
//, bindAction: '#testListAction' //鎸夋壄缁戝畾
- , data: { "HBillNo": $("#HNumber").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , data: { "HNumber": $("#HNumber").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>' + '<img id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
, '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
, '<td>绛夊緟涓婁紶</td>'
, '<td>'
@@ -1621,30 +1621,6 @@
ProImgByList.append(tr);
- //鏌愬浘鐗囨斁澶ч瑙�
- $(".ImgClass").click(function () {
- var idx = $(".ImgClass").index(this);//鑾峰彇鐐瑰嚮琛屼笅鏍囨樉绀哄搴旂殑鍥剧墖
-
- var width = $("#showImg").width();
- var height = $("#showImg").height();
- var scaleWH = width / height;
- var bigH = 600;
- var bigW = scaleWH * bigH;
- if (bigW > 900) {
- bigW = 900;
- bigH = bigW / scaleWH;
- }
-
- // 鏀惧ぇ棰勮鍥剧墖
- layer.open({
- type: 1,
- title: false,
- closeBtn: 1,
- shadeClose: true,
- area: [bigW + 'px', bigH + 'px'], //瀹介珮
- content: "<img width='" + bigW + "' height='" + bigH + "' src=" + result + " />"
- });
- });
});
}
, done: function (res, index, upload) {
@@ -1672,9 +1648,9 @@
function getFile() {
var ProImgByList = $('#ProImgByList')
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ url: GetWEBURL() + '/Gy_Mater/Filelist',
type: "GET",
- data: { "HBillNo": $("#HNumber").val() },
+ data: { "HNumber": $("#HNumber").val() },
success: function (data1) {
if (data1.count == 1) {
var index = 0;
@@ -1683,7 +1659,7 @@
, '<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>' + '<img id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + 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>'
@@ -1695,29 +1671,6 @@
$('#ProImgByList').append(tr);
}
- //鏌愬浘鐗囨斁澶ч瑙�
- $(".ImgClass").click(function () {
- var idx = $(".ImgClass").index(this);//鑾峰彇鐐瑰嚮琛屼笅鏍囨樉绀哄搴旂殑鍥剧墖
-
- var width = $("#showImg" + idx).width();
- var height = $("#showImg" + idx).height();
- var scaleWH = width / height;
- var bigH = 600;
- var bigW = scaleWH * bigH;
- if (bigW > 900) {
- bigW = 900;
- bigH = bigW / scaleWH;
- }
- // 鏀惧ぇ棰勮鍥剧墖
- layer.open({
- type: 1,
- title: false,
- closeBtn: 1,
- shadeClose: true,
- area: [bigW + 'px', bigH + 'px'], //瀹介珮
- content: "<img width='" + bigW + "' height='" + bigH + "' src=" + data1.data[idx].HFilePath + " />"
- });
- });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1760,7 +1713,7 @@
//鍒犻櫎宸蹭笂浼犳枃浠�
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+ url: GetWEBURL() + '/Gy_Mater/DeleteFilelist',
type: "GET",
data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
success: function (data1) {
@@ -1801,6 +1754,29 @@
$("#HSecUnitID").val(obj[0].HItemID);
}
}
+
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height + 500; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width + 500; //鑾峰彇鍥剧墖瀹藉害
+ var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
+ //寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ shade: 0.8,
+ offset: 'auto',
+ area: ['80%', '80%'],
+ shadeClose: true,
+ scrollbar: false,
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ cancel: function () {
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ }
+ });
+ }
+
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index df347f8..f261a2e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -103,16 +103,26 @@
</div>
</div>
</div>
- <div class="layui-row" style="padding:10px 0">
+ <!--鏀惧湪form鏍囩褰撲腑浼氬奖鍝嶈疆鎾浘绠ご鐨勪娇鐢紝鎵�浠ョЩ鍒癴orm鏍囩澶栭潰-->
+ <!--<div class="layui-row" style="padding:10px 0">
<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
- <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
+ <div style="width:99.5%;height:calc(35vh);position: relative;">-->
+ <!--//杞挱鍥�-->
+ <!--<div class="layui-carousel" id="test1" style="position:absolute;">-->
+ <!--閫忔槑搴� opacity: 0.2-->
+ <!--<div carousel-item id="file">
+
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
- </div>
+ </div>-->
<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -134,6 +144,25 @@
</div>
</script>
</form>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
+ <div style="width:99.5%;height:calc(35vh);position: relative;">
+ <!--//杞挱鍥�-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <!--閫忔槑搴� opacity: 0.2-->
+ <div carousel-item id="file">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -145,7 +174,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'carousel'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -156,6 +185,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, tree = layui.tree
+ , carousel = layui.carousel
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"];
@@ -167,6 +197,16 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ // 杞挱鍥�
+ var Carousel = carousel.render({
+ elem: '#test1'
+ , width: '100%' //璁剧疆瀹瑰櫒瀹藉害
+ , height: '100%' //璁剧疆瀹瑰櫒楂樺害
+ , arrow: 'always' //濮嬬粓鏄剧ず绠ご
+ , indicator: 'inside' //鎸囩ず鍣ㄤ笉鏄剧ず
+ , autoplay: false //鎵嬪姩鎾斁
+ , interval: 3000 //鎾斁閫熷害
+ });
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -184,7 +224,7 @@
set_AddNew();
break;
case 'btn-Edit':
- set_ShowBill();
+ set_ShowBill();
break;
case 'btn-copy':
set_copy();
@@ -316,6 +356,8 @@
l.LAY_CHECKED = flag;
}
});
+
+ getFileList_loaded(obj.data.鐗╂枡浠ｇ爜);
})
//#endregion
@@ -343,7 +385,10 @@
addSWhereByOpenType();
get_Display_Tree();
-
+ //鐗╂枡鍥剧墖浣嶇疆榛樿涓虹┖
+ var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;"></h1>';
+ $("#file").append(html2);
+ Carousel.reload({ autoplay: false })
//if (openType == 2) {
// addSWhereByOpenType();
// //get_Display(sWhere);
@@ -420,7 +465,7 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var wait = layer.load();//閬僵
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Material/list',
@@ -488,7 +533,7 @@
//#endregion
-
+
//#region 蹇�熻繃婊�
function get_FastQuery() {
@@ -892,6 +937,58 @@
return subStr;
}
+ //#region 鐐瑰嚮鐗╂枡鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFileList_loaded(HMaterNumber) {
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+
+ var HBillNo = HMaterNumber;
+ if (HBillNo != null && HBillNo != undefined) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ async: false,
+ type: "GET",
+ data: { "HBillNo": HBillNo },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data[0]) {
+ HInterID = data1.data[0].HInterID
+ }
+ option.data = data1.data;
+ //table.render(option);
+
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].HFileType == '.jpeg' || data1.data[i].HFileType == '.jpg') {
+ html += '<div><img onclick=\"previewImg(this)\" src=../../..' + data1.data[i].HFilePath + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].HFileType == '.pdf') {
+ html += '<div><embed src="../../..' + data1.data[i].HFilePath + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ }
+
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ Carousel.reload({ autoplay: false })
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -1135,6 +1232,28 @@
function GetDataCol(data) {
GetDataCols = data;
}
+
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height + 500; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width + 500; //鑾峰彇鍥剧墖瀹藉害
+ var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
+ //寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ shade: 0.8,
+ offset: 'auto',
+ area: ['100%', '100%'],
+ shadeClose: true,
+ scrollbar: false,
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ cancel: function () {
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ }
+ });
+ }
</script>
</body>
--
Gitblit v1.9.1