From ac5fa14718dee20acc4a7e9c16f01426f606688c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 16 四月 2024 15:33:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 2
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMain.html | 3
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 25 ++
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 2
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMainList.html | 28 ---
WebTM/views/video/success.wav | 0
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html | 53 +++++-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 2
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillList.html | 29 ---
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 323 ++++++++++++++++++++++++++++++++++++++-
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 2
12 files changed, 384 insertions(+), 89 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ea1e2a5..f07a5e2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 3686b84..252df04 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -428,7 +428,8 @@
icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -439,12 +440,22 @@
console.log("playSound");
var audio = document.getElementById("cs");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//鎴愬姛鎻愮ず闊�
function playSound_OK() {
console.log("playSound_OK");
var audio = document.getElementById("cs2");
audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
}
//#region 鍒濆鍖栫晫闈�
@@ -532,7 +543,8 @@
form.render('select');
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
})
}
//鍒濆鍖栬〃鏍�
@@ -544,6 +556,9 @@
, height: 'full-60'
, cellMinWidth: 90
, limit: 50
+ , done: function () {
+ layer.closeAll("loading");
+ }
};
}
@@ -595,7 +610,8 @@
else {
layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
HSourceFlag = false;
}
@@ -648,7 +664,8 @@
$("#HSupID").val(d.data[0].HCusID);
$("#HSupName").val(d.data[0].HSupName);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
})
}
@@ -719,7 +736,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -799,7 +817,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -872,7 +891,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -941,7 +961,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1010,7 +1031,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1079,7 +1101,8 @@
});
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
});
@@ -1169,6 +1192,7 @@
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1245,6 +1269,7 @@
layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1342,7 +1367,8 @@
$("#HSourceBillNo").focus();
});
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
layer.closeAll("loading");
}
@@ -1426,6 +1452,7 @@
});
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
@@ -1591,6 +1618,7 @@
});
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
@@ -1707,7 +1735,8 @@
$("#HWHName_B").val("");
$("#HSPName_B").val("");
}
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 92356ba..97bf9d6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -290,8 +290,9 @@
var HMaker = sessionStorage["HUserName"]
var HBillerID = sessionStorage["HBillerID"]
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
- var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
- var OperationType = 0 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
+ var HDisBillEntryList = false //鏄惁鍒涘缓骞舵覆鏌撹繃琛ㄦ牸
+ var OperationType = 0 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
var BarCodelistOption = [];
var columns = "";
@@ -410,14 +411,18 @@
, height: 'full-100'
, cellMinWidth: 90
, limit: 150
+ , done: function () {
+ layer.closeAll("loading");
+ }
};
//鏄庣粏娓呭崟
BarCodelistOption = {
elem: '#mx-table'
//, toolbar: '#toolbarDemo'
+ , page: true
, cellMinWidth: 90
- , limit: 3000
+ , limit: 50
, totalRow: true
, cols: [[
{ field: '鍖呭彿', title: '鍖呭彿', width: 80 }
@@ -1499,9 +1504,19 @@
listOption.cols = [columns];
listOption.data = result.data.Materlist;
listOption.totalRow = true;
- table.render(listOption);
BarCodelistOption.data = result.data.BarCodelist;
- table.render(BarCodelistOption);
+
+ if (!HDisBillEntryList) {
+ table.render(listOption); //鍒涘缓骞舵覆鏌撹〃鏍�
+ table.render(BarCodelistOption);
+ HDisBillEntryList = true;
+ }
+ else {
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.reload('wl-table', listOption); //瀵硅〃鏍艰繘琛岄噸杞�
+ table.cache['mx - table'] = null;
+ table.reload('mx-table', BarCodelistOption);
+ }
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git a/WebTM/views/video/success.wav b/WebTM/views/video/success.wav
index 5946a7a..cffb64f 100644
--- a/WebTM/views/video/success.wav
+++ b/WebTM/views/video/success.wav
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 dc91b34..3ffa5f1 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"
@@ -8,6 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -46,10 +51,12 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li >鍏朵粬淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ <li>闄勪欢淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鐗╂枡璁剧疆</b></h1>
<div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -93,15 +100,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
@@ -238,6 +245,7 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
@@ -324,7 +332,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" > 鍗曚欢鏈�澶т笂闄愶細</label>
+ <label class="layui-form-label"> 鍗曚欢鏈�澶т笂闄愶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPieceMaxQty" lay-verify="HPieceMaxQty" id="HPieceMaxQty" autocomplete="off" value="0">
</div>
@@ -513,8 +521,63 @@
<input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">甯哥敤鏉愭枡锛�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁甯哥敤鏉愭枡">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鍔犳潈骞冲潎浠凤細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HAvgStockPrice" lay-verify="HAvgStockPrice" id="HAvgStockPrice" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 缁撶畻浠�</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HFootPrice" lay-verify="HFootPrice" id="HFootPrice" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鍚◣鎴愭湰浠�</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HTaxCost" lay-verify="HTaxCost" id="HTaxCost" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 涓嶅惈绋庢垚鏈环</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HNoTaxCost" lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off" value="0">
+ </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="mainTable">
+ <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>
@@ -559,7 +622,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','colorpicker'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'colorpicker', 'upload'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -568,6 +631,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , upload = layui.upload
, colorpicker = layui.colorpicker
//鍒濆鍖栫晫闈�
@@ -578,6 +642,28 @@
//id new
$("#HItemID").val(0);
get_ReadConfigFile();
+
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ document.getElementById('testList').addEventListener('click', function () {
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ document.getElementById('HNumber').click();
+ });
+
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑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==2){
//淇敼鏃朵富琛↖D
@@ -588,6 +674,9 @@
$("#HItemID").val(hID);
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
@@ -811,6 +900,11 @@
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
, "HMaterRuleType": data.鐗╂枡鍏紡
, "HColorNo": data.棰滆壊鑹插彿
+ , "HCommonUseFlag": data.鏄惁涓嶅父鐢ㄦ潗鏂�
+ , "HAvgStockPrice": data.鍔犳潈骞冲潎浠�
+ , "HFootPrice": data.缁撶畻浠�
+ , "HTaxCost": data.鍚◣鎴愭湰浠�
+ , "HNoTaxCost": data.涓嶅惈绋庢垚鏈环
});
colorpicker.render({
@@ -841,6 +935,11 @@
data.field.HCHECKPRODUCT = 1
} else {
data.field.HCHECKPRODUCT = 0
+ }
+ if (data.field.HCommonUseFlag) {
+ data.field.HCommonUseFlag = 1
+ } else {
+ data.field.HCommonUseFlag = 0
}
var sMainStr = JSON.stringify(data.field);
//var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -1475,12 +1574,212 @@
function set_ClearBill() {
}
+
+
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+
+ , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , 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 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(''));
+
+
+ //鍗曚釜閲嶄紶
+ 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);
+
+ //鏌愬浘鐗囨斁澶ч瑙�
+ $(".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) {
+ 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() + '/Cj_StationOutBill/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 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);
+ }
+ //鏌愬浘鐗囨斁澶ч瑙�
+ $(".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 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+ /*window.location.href = url;*/
+ window.open(url)
+ }
+ //#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() + '/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 });
+ }
+ });
+ })
+ }
+ //#endregion
+
+
//杩斿洖浠撳簱
function GetHWHValue(obj) {
$("#HWhName").val(obj[0].HName);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 6851ad8..041f6cd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -93,7 +93,7 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <h1 style="text-align:center;"><b>寮傚父鍙嶉绛惧埌鍗�</b></h1>
+ <h1 style="text-align:center;"><b>寮傚父鍙嶉楠屾敹鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 657548e..ed2bc31 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -93,7 +93,7 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <h1 style="text-align:center;"><b>寮傚父鍙嶉绛惧埌鍗�</b></h1>
+ <h1 style="text-align:center;"><b>寮傚父鍙嶉澶勭悊鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
index 5eddf2a..877e2b1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMain.html"
@@ -532,7 +532,8 @@
data: {
"HInterID": linterid,
"HEntryID": HEntryID,
- "user": sessionStorage["HUserName"]
+ "user": sessionStorage["HUserName"],
+ "num": 1
},
dataType: "json",
success: function (data) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMainList.html"
index 028b868..3060b0d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackReceiveBillMainList.html"
@@ -100,7 +100,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -205,10 +204,7 @@
case 'btn-DeDrop':
set_DropBill(1);
break;
- //涓嬫帹寮傚父鍙嶉绛惧埌鎸夐挳
- case 'btn-XTSign':
- set_XTSign();
- break;
+
//涓嬫帹寮傚父鍙嶉澶勭悊鎸夐挳
case 'btn-XTHand':
set_XTHand();
@@ -474,27 +470,7 @@
}
//#endregion
- //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
- function set_XTSign() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
- layer.open({
- type: 2
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['100%', '100%']
- , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=&HSouceBillType=' + 4529 + ''
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
- }
- }
+
//涓嬫帹寮傚父鍙嶉澶勭悊鍗�
function set_XTHand() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
index 8dfad6e..376e6a8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
@@ -105,7 +105,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Test" id="btn-Test" style="display:none;"><i class="layui-icon layui-icon-circle"></i>楠岃瘉</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -193,9 +192,7 @@
//涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
case 'btn-XTReceive': set_XTReceive();
break;
- //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
- case 'btn-XTHand': set_XTHand();
- break;
+
//涓嬫帹寮傚父鍙嶉绛惧埌鍗�
case 'btn-XTSign-in': set_XTSign();
break;
@@ -553,29 +550,7 @@
}
}
- //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
- function set_XTReceive() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].HInterID.toString();
- var HEntryID = data[0].HEntryID.toString();
- layer.open({
- type: 2
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['100%', '100%']
- , title: '鏂板寮傚父鍙嶉澶勭悊鍗�'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
- }
- }
-
+
//涓嬫帹寮傚父鍙嶉绛惧埌鍗�
function set_XTSign() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index dba1d08..3a3418a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -633,7 +633,7 @@
$.ajax({
url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "7505" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
index 372190a..2851720 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
@@ -780,7 +780,7 @@
url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
async: true,
data: {
- "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0 "
+ "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0 and 榛樿宸ヨ壓='1' "
, "user": sessionStorage["HUserName"]
},
success: function (result) {
--
Gitblit v1.9.1