From 0b5714aeaf1d42aab3edba3d5e17310ffa6dafcc Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 24 三月 2026 10:50:28 +0800
Subject: [PATCH] 条码主档优化供应商id没有存入 ，增加华舟条码主档生成页面，全程追溯优化
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 147 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 121 insertions(+), 26 deletions(-)
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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
index eca7ad5..c4237e0 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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<title>宸ュ簭娲惧伐缂栬緫</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
@@ -11,6 +12,9 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -24,6 +28,12 @@
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
+ }
+
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
}
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
@@ -51,12 +61,10 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
- <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>-->
- <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
- </div>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align:center;"><b>宸ュ簭娴佽浆鍗℃淳宸�</b></h1>
<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>
@@ -86,11 +94,11 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
- </div>
+ </div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娲惧伐鏃ユ湡</label>
<div class="layui-input-inline">
@@ -98,7 +106,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row">
<div class="layui-col-xs6 layui-inline">
<label class="layui-form-label" style="width:12.5%">鎽樿</label>
<div class="layui-input-inline">
@@ -120,7 +128,7 @@
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
</div>
</div>
- </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -203,6 +211,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -241,6 +250,14 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3798";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+ var HModName = 'Sc_ProcessSendWorkEdit'
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -256,6 +273,7 @@
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+ var HEmpIDs = params[params[4]];//鑱屽憳鍒楄〃
}
//宸ュ簭娲惧伐鏂板
@@ -271,13 +289,13 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- //鏌ヨ宸ュ簭娴佽浆鍗�
- get_ProcessExchange();
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鏌ヨ宸ュ簭娴佽浆鍗�
+ get_ProcessExchange();
} else if (OperationType == 3) {
//绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ $("#HPRDORGID").attr("disabled", true);
//鍒濆鍖栫晫闈�
set_ClearBill();
RoadBillMain(linterid);
@@ -329,6 +347,10 @@
}
form.render('select');
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
break;
}
});
@@ -392,7 +414,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -402,10 +424,10 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HMaterName: checkStatus.data[0].HName
+ HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О
, HMaterID: checkStatus.data[0].HItemID
- , HMaterNumber: checkStatus.data[0].HNumber
- , HMaterModel: checkStatus.data[0].HModel
+ , HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜
+ , HMaterModel: checkStatus.data[0].瑙勬牸鍨嬪彿
});
layer.close(layer.index);
@@ -426,7 +448,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -436,9 +458,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HUnitName: checkStatus.data[0].HName
+ HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, HUnitID: checkStatus.data[0].HItemID
- , HUnitNumber: checkStatus.data[0].HNumber
+ , HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜
});
layer.close(layer.index);
@@ -586,7 +608,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -596,7 +618,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HWorkShopName").val(checkStatus.data[0].HName);
+ $("#HWorkShopName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HWorkShopID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -621,6 +643,7 @@
$("#HPlanEndDate").val(Format(new Date().setMonth(new Date().getMonth() + 1), "yyyy-MM-dd"));//宸ュ簭璁″垝瀹屽伐鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
//鑾峰彇缁勭粐
@@ -636,8 +659,8 @@
for (var i = 0; i < data.length; i++) {
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
- $("#HUSEORGID").append(Organization);
- $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -650,7 +673,7 @@
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿' }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿' }
, { field: 'HMainID', title: '娲惧伐鍗曚富ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
, { field: 'HEntryID', title: '娲惧伐鍗曞瓙ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
, { field: 'HSourceInterID', title: '娴佽浆鍗D', hide: true }
@@ -674,7 +697,7 @@
, { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
, { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
- , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: true }
+ , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: false }
, { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�', hide: true }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
, { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck", hide: true}
@@ -762,6 +785,9 @@
)
}
option.data = rowdata;
+
+ setTableHEmp(HEmpIDs);
+
table.render(option);
form.render('select');
} else {
@@ -774,7 +800,53 @@
});
}
+ function setTableHEmp(HEmpIDs) {
+ if (HEmpIDs != undefined && HEmpIDs != null && HEmpIDs != 0 && HEmpIDs != "") {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Employee/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": " and HItemID in (" + HEmpIDs + ")", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ const newData = [];
+ // 閬嶅巻 option.data 鐨勬瘡涓璞�
+ option.data.forEach(templateItem => {
+ // 瀵规瘡涓� templateItem锛屽鍒� data1.length 娆�
+ data.forEach(dataItem => {
+ // 娣辨嫹璐� templateItem
+ const newItem = JSON.parse(JSON.stringify(templateItem));
+
+ // 鏇挎崲瀛楁
+ newItem.HWorkerID = dataItem.HItemID;
+ newItem.HWorkerNumber = dataItem.鑱屽憳浠ｇ爜;
+ newItem.HWorkerName = dataItem.鑱屽憳鍚嶇О;
+
+ // 娣诲姞鍒版柊鏁扮粍
+ newData.push(newItem);
+ });
+ });
+
+ // 鏇挎崲鍘� option.data
+ option.data = newData;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
//闈炵┖楠岃瘉
function AllowLoadData(data) {
@@ -822,7 +894,7 @@
{
var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList",
+ url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillEdit",
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -838,11 +910,13 @@
$("#HExplanation").val(result.data[0]["鎽樿"]);
$("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);
+
var rowdata = [];
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
- "HProcNo": result.data[i]["娴佹按鍙�"], "HMaterID": result.data[i]["浜у搧ID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["鍗曚綅ID"], "HUnitNumber": result.data[i]["璁￠噺鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["璁￠噺鍗曚綅鍚嶇О"],
+ "HSourceInterID": result.data[i]["HSourceInterID"], "HSourceEntryID": result.data[i]["HSourceEntryID"], "HSourceBillNo": result.data[i]["宸ュ簭娴佽浆鍗″彿"],
+ "HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"],"HMaterID": result.data[i]["浜у搧ID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["鍗曚綅ID"], "HUnitNumber": result.data[i]["璁￠噺鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["璁￠噺鍗曚綅鍚嶇О"],
"HSourceID": result.data[i]["鐢熶骇璧勬簮ID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮鍚嶇О"], "HWorkerID": result.data[i]["鎿嶄綔宸D"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸ュ悕绉�"],
"HGroupID": result.data[i]["鐝粍ID"], "HGroupNumber": result.data[i]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍鍚嶇О"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": result.data[i]["娲惧伐鏁伴噺"], "HBatchNo": result.data[i]["鎵规"], "HPlanBeginDate": result.data[i]["瑕佹眰寮�宸ユ棩鏈�"],
"HPlanEndDate": result.data[i]["瑕佹眰瀹屽伐鏃ユ湡"]
@@ -857,6 +931,27 @@
})
}
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
//鎵撳嵃
function get_print(data) {
--
Gitblit v1.9.1