From 1b7bd736c8e76137a625e8dd67d655eb63bfbed3 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 11 十二月 2024 09:41:49 +0800
Subject: [PATCH] 完善出厂检验单,类似于首件一样,人员履历报表,在全程报表链接打开时,增加一个物料过滤,修复客户基础资料打开数据不显示,优化人机料法报表,数据显示不全问题
---
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 266 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 247 insertions(+), 19 deletions(-)
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index 0074bc5..9ccb0f0 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -43,6 +43,7 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">闄勪欢涓婁紶</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -75,7 +76,7 @@
</button>
</div>
</div>
-
+
</div>
<div class="layui-row">
@@ -475,18 +476,18 @@
</div>
</div>
<div class="layui-row">
-
+
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐濆＋杈鹃儴闂�</label>
- <div class="layui-input-inline">
- <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
- <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">璐濆＋杈鹃儴闂�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
+ <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -535,7 +536,7 @@
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">韬唤璇�</label>
<div class="layui-input-block">
- <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
+ <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
</div>
</div>
</div>
@@ -695,7 +696,30 @@
</div>
</div>
</div>
- </div>
+ </div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <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" lay-filter="fileTable">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>鍥剧墖</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList" class="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</form>
@@ -710,7 +734,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'upload', 'element'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -718,6 +742,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , upload = layui.upload
+ , laydate = layui.laydate
, element = layui.element;
var date = new Date();
var day = date.getDate();
@@ -744,11 +770,37 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ document.getElementById('testList').addEventListener('click', function () {
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ document.getElementById('HNumber').click();
+ if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鑱屽憳浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犳枃浠讹紒', { time: 3 * 1000, icon: 3 });
+ }
+ });
+
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
+ document.getElementById('HNumber').addEventListener('change', function () {
+ var inputHNumber = document.getElementById('HNumber');
+ var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
+
+ if (hNumberValue == '') {
+ // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
+ layer.msg("鑱屽憳浠ｇ爜涓虹┖,鏃犳硶杩涜鏂囦欢涓婁紶");
+ this.value = '';
+ } else {
+ // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
+ PicUpload();
+ }
+ });
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
else if (OperationType == 4) {//娴忚
$("#HItemID").val(linterid);//
@@ -1046,6 +1098,7 @@
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + "GetGy_EmployeeDetail",
+ async:false,
type: "GET",
data: {
"HID": linterid
@@ -1179,6 +1232,7 @@
});
}
//#endregion
+
function formatDate(date) {
var d = new Date(date),
month = '' + (d.getMonth() + 1),
@@ -1190,6 +1244,7 @@
return [year, month, day].join('-');
}
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
data.field.HUseOrgID = sessionStorage["OrganizationID"];
@@ -1405,9 +1460,7 @@
}
});
}
- //#endregion
-
-
+ //#endregion
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
@@ -1449,10 +1502,185 @@
return Result;
}
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/Gy_Employee_UploadFile"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#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 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>'
+ , '<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(''));
- //浠ヤ笂鏄痩ayui妯″潡
+ //鍗曚釜閲嶄紶
+ 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(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+ 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'); //鏄剧ず涓婁紶
+ }
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFile() {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Employee_Filelist',
+ type: "GET",
+ data: { "HBillNo": $("#HNumber").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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>' + '<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>'
+ , '<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 });
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
});
+
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height * 1.2; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width * 1.2; //鑾峰彇鍥剧墖瀹藉害
+ 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 });
+ }
+ });
+ }
+
+ //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ }
+ //#endregion
+
+ //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+ 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() + '/Gy_Employee_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 });
+ }
+ });
+ })
+ }
+ //#endregion
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1