From ee3c35b9a8e50af7bdcdd1218d181a0b4c8e66ba Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 21 十月 2025 09:32:49 +0800
Subject: [PATCH] 打印配置文件修改成惠康信息;通过送货物料信息带出供应商ID,送货数量为0不允许生成条码;送货物料列表改为模糊排序;送货物料编辑页面添加选供应商功能;标准包装列表添加导入功能;添加供应商列表
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html | 74 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
index b04bd1a..5b11603 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -82,7 +82,7 @@
</button>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡绠�绉�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HUserID" id="HUserID" value="0">
@@ -97,6 +97,12 @@
</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" class="layui-input" name="HMaterName0" id="HMaterName0" readonly>
+ </div>
+ </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈�灏忓寘瑁�</label>
<div class="layui-input-inline">
@@ -123,9 +129,12 @@
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" readonly>
- <input type="text" class="layui-input" name="HSupID" id="HSupID" style="display:none;" >
+ <div class="layui-input-inline" style="position: relative;">
+ <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" readonly style="padding-right: 40px;">
+ <input type="text" class="layui-input" name="HSupID" id="HSupID" style="display:none;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSupID" id="btnSearchSupID" style="position: absolute; right: 0; top: 0; bottom: 0; border-left: none; border-radius: 0 4px 4px 0; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -510,6 +519,43 @@
get_print(data);
});
+ //閫夋嫨渚涘簲鍟嗗脊绐�
+ form.on('submit(btnSearchSupID)', function () {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '渚涘簲鍟嗗垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍩虹璧勬枡/Gy_Supplier_Material.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupNumber").val(checkStatus.data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+
//鐗╂枡鏍¢獙
form.on('submit(btnCheck)', function (data) {
get_MaterialCheck(0);
@@ -603,8 +649,13 @@
return;
}
}
+ if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == undefined) {
+ layer.msg("鐗╂枡淇℃伅鏈牎楠屾垚鍔燂紝涓嶅厑璁镐繚瀛橈紒");
+ return;
+ }
+
var HMaterID = $('#HMaterNumber').val();
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ';' + sessionStorage["OrganizationID"];
//var sMainSub = sMainStr + ";" + HMaterID;
var itID = $('#HitemID').val();
var index = layer.load();
@@ -764,7 +815,7 @@
var HMaterID = $("#HMaterID").val();
var user = sessionStorage["HUserName"];
var OrganizationID = sessionStorage["OrganizationID"];
- var SupID = $("#SupID").val();
+ var SupID = $("#HSupID").val();
$.ajax({
type: "GET",
@@ -806,8 +857,12 @@
});
} else if (responseData.code === "1") {
- $("#HMaterName").val(responseData.data[0]["HSubjoin"] == null ? responseData.data[0]["HName"] : responseData.data[0]["HSubjoin"]);
+ $("#HMaterName0").val(responseData.data[0]["HName"]);
+ $("#HMaterName").val(responseData.data[0]["HSubjoin"]);
$("#HModel").val(responseData.data[0]["HModel"]);
+ $("#HMaterID").val(responseData.data[0]["HItemID"]);
+
+
form.render('select');
} else {
layer.msg(responseData.Message || "鐗╂枡淇℃伅涓嶅瓨鍦�", { time: 5000 });
@@ -824,7 +879,10 @@
//鑾峰彇渚涘簲鍟咺D
function FetchSupInfo() {
var sWhere = "";
- var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+ //var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+ if (sessionStorage["HSupIDs"].length < 1000) {
+ sWhere = " and HItemID in (" + sessionStorage["HSupIDs"] + ")";
+ }
$.ajax({
url: GetWEBURL() + "/Gy_Supplier/list",
type: "GET",
--
Gitblit v1.9.1