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 | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 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 291a064..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>
@@ -12,6 +13,8 @@
<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; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -25,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 {
@@ -52,10 +61,7 @@
<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>
@@ -88,7 +94,7 @@
<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>
@@ -205,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>
@@ -250,6 +257,7 @@
$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
+ var HModName = 'Sc_ProcessSendWorkEdit'
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -265,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]];//鑱屽憳鍒楄〃
}
//宸ュ簭娲惧伐鏂板
@@ -280,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);
@@ -338,6 +347,10 @@
}
form.render('select');
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
break;
}
});
@@ -630,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)
}
//鑾峰彇缁勭粐
@@ -645,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");
@@ -659,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 }
@@ -683,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}
@@ -771,6 +785,9 @@
)
}
option.data = rowdata;
+
+ setTableHEmp(HEmpIDs);
+
table.render(option);
form.render('select');
} else {
@@ -783,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) {
@@ -831,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"] },
@@ -847,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]["瑕佹眰瀹屽伐鏃ユ湡"]
--
Gitblit v1.9.1