From 90f4e6774b6e72e4674f514b80281b5e2829e4e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 09 五月 2023 10:33:17 +0800
Subject: [PATCH] 流转卡编辑进去染色要求改为可修改 物料列表 、生产订单列表、工艺路线列表、流转卡列表 ，过滤条款把物料代码。物料名称。规格型号放在最上面不需要点更多去查看
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 146 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 104 insertions(+), 42 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index bd48a77..2091d32 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -56,14 +56,20 @@
<div class="layui-input-block" style="margin-top:10px">
<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
- <option value="鏈笅鎺�" selected="selected">鏈笅鎺�</option>
+ <option value="鏈笅鎺�" >鏈笅鎺�</option>
</select>
</div>
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
@@ -92,12 +98,7 @@
<input type="text" class="layui-input" name="HBillType" id="HBillType">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍞竴ID</label>
<div class="layui-input-block">
@@ -165,6 +166,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
@@ -174,7 +176,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
</div>
@@ -254,6 +256,9 @@
break;
//鎵归噺涓嬫帹
case 'set_ShowBill_pl': set_ShowBill_pl(); //set_ShowBill_pl
+ break;
+ //澶氳涓嬫帹
+ case 'set_ShowBill_dh': set_ShowBill_dh();
break;
//鏂板
case 'set_AddNew': set_AddNew();
@@ -422,67 +427,71 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
- , cellMinWidth: 90
+ , cellMinWidth: 'auto'
, totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
- , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
- , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115, totalRow: true }
- , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', width: 115 }
- , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 115 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О'}
+ , { field: '瀹㈡埛', title: '瀹㈡埛' }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
+ , { field: 'HWidth', title: '闂ㄥ箙' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true }
+ //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: 'HAuxQty', title: '杈呮暟閲�' }
+ , { field: 'HAuxUnitName', title: '杈呭姪鍗曚綅' }
, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
, { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
, { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
, { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
, { field: '淇敼浜�', title: '淇敼浜�' }
, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '鍞竴ID', title: '鍞竴ID', sort: true, }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', }
+ , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜' }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
//, { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
//, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
//, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
-
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
- , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
- , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
- , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
- , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
- , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
- , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true }
+ , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true }
+ , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true }
+ , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true }
+ , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true }
+ , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true }
//, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
//, { field: 'HDeptID', title: 'HDeptID', hide: true}
//, { field: 'HMaterID', title: 'HMaterID', hide: true }
//, { field: 'hunitid', title: 'hunitid', hide: true }
//, { field: 'hempid', title: 'hempid' , hide: true}
//, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
- //, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true}
+
//, { field: 'hcusid', title: 'hcusid', hide: true }
//, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
- //, { field: '瀹㈡埛', title: '瀹㈡埛', hide: true }
+
//, { field: 'HCenterID', title: 'HCenterID' , hide: true}
//, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true}
//, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true}
@@ -500,6 +509,22 @@
//, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
]]
+ , done: function (res, curr, count) {
+ var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
+ var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
+ var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
+ for (var i = 0; i < $data.length; i++) {
+ var l1 = $data.eq(i).find('div').width();
+ var l2 = $head.eq(i).find('div').width();
+ if (l1 > l2) {
+ $head.eq(i).find('div').width(l1);
+ $total.eq(i).find('div').width(l1);
+ } else {
+ $data.eq(i).find('div').width(l2);
+ $total.eq(i).find('div').width(l2);
+ }
+ }
+ }
};
}
@@ -709,6 +734,43 @@
}
}
+ //澶氳鎵归噺涓嬫帹鍗曟嵁
+ function set_ShowBill_dh() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 0) {
+ layer.confirm("纭瑕佷笅鎺ㄥ悧?", function (index) {
+ var wait = layer.load();
+ var hmainid = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var linterid = data[i].hmainid.toString();
+ var HEntryID = data[i].HEntryID.toString();
+ hmainid.push(linterid + "|" + HEntryID);
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/Sc_ICMOReportBill_dh',
+ type: "GET",
+ data: { "HInterID": hmainid.toString(), "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.alert(result.Message);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+
//鏂板
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1