From 2f1e5bde1de562bcc0ee334714b7799d1eec0ea8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 一月 2024 13:45:34 +0800
Subject: [PATCH] 生成条码时修改计算有效期至逻辑，新增生产日期不可为空控制；条码列表改为动态加载，新增列设置按钮；退货单模块；送货单列表新增凯贝修改前备份文件；送货单编辑模块新增选源单功能；采购订单列表备份；excel导入生成送货单添加行合计；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 134 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 119 insertions(+), 15 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index b9bb524..98ab8e4 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -27,6 +27,7 @@
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -92,7 +93,7 @@
</div>
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs3" style="display:none;">
<label class="layui-form-label"> 閮� 闂細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
@@ -127,9 +128,9 @@
<div class="layui-input-inline">
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
- </div>
+ </div>
</div>
- </div>
+ </div>
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -145,9 +146,31 @@
</div>
</div>
<div class="layui-col-xs3">
- <label class="layui-form-label"> 鑱旂郴鏂瑰紡锛�</label>
+ <label class="layui-form-label"> 鑱旂郴鏂瑰紡(鏀�)锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HReceiveGoodsLink" id="HReceiveGoodsLink" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 閫佽揣浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsMan" id="HSendGoodsMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 閫佽揣鍦板潃锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsAddr" id="HSendGoodsAddr" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鑱旂郴鏂瑰紡(閫�)锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsLink" id="HSendGoodsLink" autocomplete="off">
</div>
</div>
</div>
@@ -222,6 +245,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
<script src="../../../../Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/Scripts/general.js"></script>
<script>
function getUrlVars() {
var vars = [], hash;
@@ -274,6 +298,9 @@
$("#HManagerName").val(d.data[0].HManagerName);
$("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
$("#HPURCHASEORGName").val(d.data[0].HOrgName);
+ $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
+ $("#HAddress").val(d.data[0].HAddress);
+ //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
}
});
@@ -289,6 +316,7 @@
, layer = layui.layer
, laydate = layui.laydate
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+ window.table = layui.table
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDHDate'
@@ -296,7 +324,10 @@
RoadHBillSub();
layer.load(3)
+ var HIsAduit = false;
+
var HModName = "SRM_POInStockBill_Edit";
+ window.HSubData = "";//鍏ㄥ眬鍙橀噺
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -314,26 +345,27 @@
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, hide: true }
- , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text', event: "inputHQty" }
+ , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty" }
, { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 120, edit: 'text' }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', width: 200, edit: true }
+ , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true}
//, { field: 'HRemark', title: '澶囨敞', width: 100 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
, { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200 }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200, hide: true }
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
, { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 200, edit: 'text' }
, { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 200, edit: 'text' }
, { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true, hide: true }//鐟炵惇,鍑礉
@@ -484,7 +516,7 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
- break;
+ break;
};
});
//鐩戝惉琛屽伐鍏蜂簨浠�
@@ -588,9 +620,11 @@
success: function (result) {
if (result.count == 10000) {
for (let i = 0; i < result.data.length; i++) {
- result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0,6);
+ result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
}
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ HSubData = ajaxReturnData;
+ console.log(ajaxReturnData);
table.reload('mainTable', {
data: ajaxReturnData
, height: 'full-10'
@@ -654,6 +688,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ HIsAduit = true;
$('#aduit-btn').addClass("layui-btn-disabled").attr("disabled", true);
layer.msg(data.Message, { icon: 1 });
}
@@ -667,7 +702,11 @@
}
});
});
- form.on('submit(Print)', function (data) {//瀹℃牳
+ form.on('submit(Print)', function (data) {//鎵撳嵃
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
$.ajax(
{
type: "GET",
@@ -701,7 +740,24 @@
}
});
});
- form.on('submit(Exit)', function (data) {//淇濆瓨
+
+ form.on('submit(ChooseSource)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '閲囪喘璁㈠崟鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ });
+
+ form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
@@ -773,9 +829,14 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- if (sSubStr[i].HBatchNo == "") {
+ if (sSubStr[i].HKFDate == "") {
//鍑礉
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡D/C涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HKFDate > Format(new Date(), "yyyy-MM-dd")) {
+ //鍑礉
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡澶т簬褰撳墠鏃ユ湡锛岃閲嶆柊閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -907,6 +968,49 @@
//}
});
+
+ function GetPoorderValue(obj) {
+ var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2,6);//6浣嶆暟褰撳墠鏃ユ湡
+
+ var HSubLen = HSubData.length + 1;
+ var a = [];
+ for (let i = 0; i < obj.length; i++) {
+ var row_options = {
+ //"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].鍗曟嵁鍙�, "HWWOrderInterID": 0,
+ //"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+ //"HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+ //"HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].璁￠噺鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+ //"HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].璁㈠崟鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": new Date(), "HKFDate": new Date(),
+ //"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hentryid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].鍗曟嵁鍙�,
+ //"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date()
+
+ "sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
+ "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": Batchno, "HMaterID": obj[i].hmaterid,
+ "HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+ "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鏈叧鑱旀暟閲�,
+ "HRQty": obj[i].鏈叧鑱旀暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": '',
+ "HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
+ "HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date(),
+ "HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
+ };
+ HSubData.push(row_options);
+ HSubLen++;
+
+ //var NewRow = {
+ // "HMTONO": "", "HMaterID": 0, "HMaterNumber": "", "HOldMaterNumber": "", "HMaterShortNumber": "", "HMaterName": 0, "HMaterModel": "", "HUnitName": "0", "HUnitNumber": "",
+ // "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
+ //};
+ };
+ table.reload('mainTable', {
+ data: HSubData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+ }
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1