From 954616996351bb11b222adac1e0b83bae6b86cfb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 15 八月 2025 09:35:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBill_PDA.html | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
index 6986ec1..42ef530 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
@@ -844,7 +844,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1407,8 +1407,6 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
- } else if (data[i].name == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
} else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
--
Gitblit v1.9.1