From b24f97de0b8bf86f17f50ac4471dd4c6e24fa22d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 19 六月 2025 08:03:31 +0800
Subject: [PATCH] 修改 SET表 PNL表 展示 编码 ,PNL布局编辑 页面布局1
---
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit.html | 38 ++++++++++++-------
WebTM/views/基础资料/公用基础资料/Gy_BarCodeBill_PNL_TempList.html | 22 +++++-----
WebTM/layuiadmin/zy_dropdown.js | 4 +
WebTM/WebTM.csproj | 4 --
WebTM/views/基础资料/公用基础资料/Gy_BarCodeBill_Set_TempList.html | 22 +++++-----
5 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b6ef748..1593d20 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -88,7 +88,6 @@
<Content Include="HtmlPage1.html" />
<Content Include="img\AI鑺墖.png" />
<Content Include="img\ic鑺墖.png" />
- <Content Include="img\鍗庤繙鐩存柟鍥捐儗鏅�.jpeg" />
<Content Include="img\鏅鸿兘鑺墖.png" />
<Content Include="img\鏅鸿兘鑺墖锛�.png" />
<Content Include="img\鐢靛瓙鎶�鏈�.png" />
@@ -660,11 +659,8 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
-<<<<<<< HEAD
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillTotalList.html" />
-=======
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport_His.html" />
->>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
diff --git a/WebTM/layuiadmin/zy_dropdown.js b/WebTM/layuiadmin/zy_dropdown.js
index bb97dce..549f4cc 100644
--- a/WebTM/layuiadmin/zy_dropdown.js
+++ b/WebTM/layuiadmin/zy_dropdown.js
@@ -40,6 +40,7 @@
// 鍙墿灞曞叾浠栫被鍨�
switch (type) {
case "icon": createIconCardItem([dropItems], dataList); break;
+ default: console.error("鏈煡type绫诲瀷"); return;
}
globalDropdownWrapper.addEventListener("click", function (e) {
callback.call(e)
@@ -55,6 +56,7 @@
dropItem.style.flexDirection = "column"
dropItem.style.justifyContent = "center"
dropItem.style.alignItems = "center"
+ dropItem.style.padding = "5px"
dropItem.style.width = "96px";
dropItem.style.height = "96px";
dropItem.style.boxSizing = "border-box";
@@ -68,7 +70,7 @@
let span = document.createElement("span");
span.setAttribute('databinding', true)
- span.setAttribute('data-value', data.imgUrl)
+ span.setAttribute('data-value', data.imgValue)
span.innerText = data.imgName;
span.style.maxWidth = "100%" // 闄愬埗鏈�澶у搴�
span.style.height = "20%"
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/Gy_BarCodeBill_PNL_TempList.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/Gy_BarCodeBill_PNL_TempList.html"
index 3455b87..b0fb3d4 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/Gy_BarCodeBill_PNL_TempList.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/Gy_BarCodeBill_PNL_TempList.html"
@@ -188,10 +188,10 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -485,16 +485,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- if (data[i].name === '鏉＄爜缂栧彿') {
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
- templet: function (d) {
- return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
- }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
- });
- } else {
+ //if (data[i].name === '鏉＄爜缂栧彿') {
+ // col.push({
+ // field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ // templet: function (d) {
+ // return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
+ // }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
+ // });
+ //} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
- }
+ //}
}
}
}
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/Gy_BarCodeBill_Set_TempList.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/Gy_BarCodeBill_Set_TempList.html"
index b7a2af7..428303c 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/Gy_BarCodeBill_Set_TempList.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/Gy_BarCodeBill_Set_TempList.html"
@@ -188,10 +188,10 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -484,16 +484,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- if (data[i].name === '鏉＄爜缂栧彿') {
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
- templet: function (d) {
- return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
- }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
- });
- } else {
+ //if (data[i].name === '鏉＄爜缂栧彿') {
+ // col.push({
+ // field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ // templet: function (d) {
+ // return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
+ // }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
+ // });
+ //} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
- }
+ //}
}
}
}
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/Gy_PNLInfoEdit.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/Gy_PNLInfoEdit.html"
index cb1175c..da4a8c1 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/Gy_PNLInfoEdit.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/Gy_PNLInfoEdit.html"
@@ -337,24 +337,34 @@
// 娓叉煋鍥炬爣涓嬫媺妗�
setDropdownContent([
{
- imgUrl: "https://img.icons8.com/?size=100&id=NoLd9XxtUety&format=png&color=000000",
- imgName: "鍥剧墖1"
+ imgUrl: "../../../img/AI鑺墖.png",
+ imgName: "AI鑺墖.png",
+ imgValue: "/img/AI鑺墖.png"
}, {
- imgUrl: "https://img.icons8.com/?size=100&id=34LwnMbJnkXt&format=png&color=000000",
- imgName: "鍥剧墖2"
+ imgUrl: "../../../img/ic鑺墖.png",
+ imgName: "ic鑺墖.png",
+ imgValue: "/img/ic鑺墖.png"
}, {
- imgUrl: "https://img.icons8.com/?size=100&id=2wWIUxJLzUPN&format=png&color=000000",
- imgName: "鍥剧墖3"
+ imgUrl: "../../../img/鐢佃剳涓绘澘.png",
+ imgName: "鐢佃剳涓绘澘.png",
+ imgValue: "/img/鐢佃剳涓绘澘.png"
}, {
- imgUrl: "https://img.icons8.com/?size=100&id=113560&format=png&color=000000",
- imgName: "鍥剧墖4"
+ imgUrl: "../../../img/鐢靛瓙鎶�鏈�.png",
+ imgName: "鐢靛瓙鎶�鏈�.png",
+ imgValue: "/img/鐢靛瓙鎶�鏈�.png"
}, {
- imgUrl: "https://img.icons8.com/?size=100&id=119961&format=png&color=000000",
- imgName: "鍥剧墖5"
+ imgUrl: "../../../img/鑺墖.png",
+ imgName: "鑺墖.png",
+ imgValue: "/img/鑺墖.png"
}, {
- imgUrl: "https://img.icons8.com/?size=100&id=uorqa1hwCGPC&format=png&color=000000",
- imgName: "鍥剧墖6"
- },
+ imgUrl: "../../../img/鏅鸿兘鑺墖锛�.png",
+ imgName: "鏅鸿兘鑺墖锛�.png",
+ imgValue: "/img/鏅鸿兘鑺墖锛�.png"
+ }, {
+ imgUrl: "../../../img/鏅鸿兘鑺墖.png",
+ imgName: "鏅鸿兘鑺墖.png",
+ imgValue: "/img/鏅鸿兘鑺墖.png"
+ }
]
, type = "icon"
, function () {
@@ -425,7 +435,7 @@
, { templet: '#xuhao', field: "搴忓彿", title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HInterID', title: '涓昏〃ID', hide: true, width: 100 }
, { field: 'HEntryID', title: '瀛愯〃ID', hide: true, width: 100 }
- , { field: 'HLayOutName', title: 'PNL甯冨眬鍚嶇О', width: 100, edit: 'text', event: 'onHLayoutNameKeyDownHandler'}
+ , { field: 'HLayOutName', title: 'PNL甯冨眬鍚嶇О', width: 100, event: 'onHLayoutNameKeyDownHandler'}
, { field: 'HSetNo', title: 'set鍙�', width: 100, edit: 'text' }
, { field: 'HPCSNo', title: 'PCS鍙�', width: 100, edit: 'text' }
, { field: 'HPosition_x', title: 'PCS琛岀储寮�', width: 100, totalRow: true, edit: 'text' }
--
Gitblit v1.9.1