From 2bb2ec7bb9d2989bbb3b7d6de2d1228c3c4af609 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 25 八月 2021 08:55:23 +0800
Subject: [PATCH] 合并

---
 WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html |  120 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 77 insertions(+), 43 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index 0c5d786..9706cd4 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -61,56 +61,82 @@
               , cols: [[
                   { type: 'radio' }
                   , { field: 'hmainid', width: 150, title: 'hmainid', hide: true }
-                  , { field: 'HEntryID', width: 150, title: 'HEntryID', hide: true }
-                  , { field: 'HEmpID', width: 150, title: 'HEmpID', hide: true }
-                  , { field: 'HBomID', width: 150, title: 'HBomID', hide: true }
-                  , { field: 'HRoutingInterID', width: 150, title: 'HRoutingInterID', hide: true }
-                  , { field: 'hsubid', width: 150, title: 'hsubid', hide: true }
+                  , { field: 'hicmointerid', width: 150, title: 'hicmointerid', hide: true }
+                  , { field: 'HICMOEntryID', width: 150, title: 'HICMOEntryID', hide: true }
+                  , { field: 'HWorkShopID', width: 150, title: 'HWorkShopID', hide: true }
                   , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
                   , { field: 'HUnitID', width: 150, title: 'HUnitID', hide: true }
-                  , { field: 'HAuxPropID', width: 150, title: 'HAuxPropID', hide: true }
-                  , { field: 'HDeptID', width: 150, title: 'HDeptID', hide: true }
-                  , { field: 'HEntryCusID', width: 150, title: 'HEntryCusID', hide: true }
+                  , { field: 'HSupID', width: 150, title: 'HSupID', hide: true }
+                  , { field: 'hsubid', width: 150, title: 'hsubid', hide: true }
+                  , { field: 'HProcID', width: 150, title: 'HProcID', hide: true }
                   , { field: 'HCenterID', width: 150, title: 'HCenterID', hide: true }
+                  , { field: 'HDeptID', width: 150, title: 'HDeptID', hide: true }
+                  , { field: 'HGroupID', width: 150, title: 'HGroupID', hide: true }
+                  , { field: 'HWorkerID', width: 150, title: 'HWorkerID', hide: true }
+                  , { field: 'HSourceID', width: 150, title: 'HSourceID', hide: true }
+                  , { field: 'HBillType', width: 150, title: 'HBillType', hide: true }
                   , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
                   , { field: '鍗曟嵁鍙�', width: 150, title: '鍗曟嵁鍙�' }
-                  , { field: '璁㈠崟璺熻釜鍙�', width: 150, title: '璁㈠崟璺熻釜鍙�' }
-                  , { field: '鍗曟嵁绫诲瀷', width: 150, title: '鍗曟嵁绫诲瀷' }
-                  , { field: '鐘舵��', width: 150, title: '鐘舵��' }
-                  , { field: '涓氬姟鍛樹唬鐮�', width: 150, title: '涓氬姟鍛樹唬鐮�' }
-                  , { field: '涓氬姟鍛�', width: 150, title: '涓氬姟鍛�' }
-                  , { field: 'BOM鍗曠紪鐮�', width: 150, title: 'BOM鍗曠紪鐮�' }
-                  , { field: '宸ヨ壓璺嚎浠g爜', width: 150, title: '宸ヨ壓璺嚎浠g爜' }
-                  , { field: '宸ヨ壓璺嚎', width: 150, title: '宸ヨ壓璺嚎' }
-                  , { field: '榻愬鏁伴噺', width: 150, title: '榻愬鏁伴噺' }
-                  , { field: '璁″垝鐢熶骇鏁伴噺', width: 150, title: '璁″垝鐢熶骇鏁伴噺' }
-                  , { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
-                  , { field: '浜у搧浠g爜', width: 150, title: '浜у搧浠g爜' }
-                  , { field: '浜у搧鍚嶇О', width: 150, title: '浜у搧鍚嶇О' }
-                  , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
-                  , { field: '璁¢噺鍗曚綅浠g爜', width: 150, title: '璁¢噺鍗曚綅浠g爜' }
-                  , { field: '璁¢噺鍗曚綅', width: 150, title: '璁¢噺鍗曚綅' }
-                  , { field: '杈呭姪灞炴��', width: 150, title: '杈呭姪灞炴��' }
-                  , { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
-                  , { field: '鐢熶骇浠诲姟鍗曟暟閲�', width: 150, title: '鐢熶骇浠诲姟鍗曟暟閲�' }
-                  , { field: '鍏ュ簱鏁伴噺', width: 150, title: '鍏ュ簱鏁伴噺' }
+                  , { field: '浠诲姟鍗曞彿', width: 150, title: '浠诲姟鍗曞彿' }
+                  , { field: '鐢熶骇璁㈠崟鍙�', width: 150, title: '鐢熶骇璁㈠崟鍙�' }
                   , { field: '鐢熶骇杞﹂棿浠g爜', width: 150, title: '鐢熶骇杞﹂棿浠g爜' }
                   , { field: '鐢熶骇杞﹂棿', width: 150, title: '鐢熶骇杞﹂棿' }
-                  , { field: '瀹㈡埛浠g爜', width: 150, title: '瀹㈡埛浠g爜' }
-                  , { field: '瀹㈡埛', width: 150, title: '瀹㈡埛' }
-                  , { field: '瀹㈡埛鍨嬪彿', width: 150, title: '瀹㈡埛鍨嬪彿' }
-                  , { field: '宸ヤ綔涓績浠g爜', width: 150, title: '宸ヤ綔涓績浠g爜' }
-                  , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
-                  , { field: '璁″垝璺熻釜鍙�', width: 150, title: '璁″垝璺熻釜鍙�' }
+                  , { field: '浜у搧浠g爜', width: 150, title: '浜у搧浠g爜' }
+                  , { field: '浜у搧', width: 150, title: '浜у搧' }
+                  , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
+                  , { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
+                  , { field: '鍗曚綅浠g爜', width: 150, title: '鍗曚綅浠g爜' }
+                  , { field: '鍗曚綅', width: 150, title: '鍗曚綅' }
+                  , { field: '鐢熶骇鏁伴噺', width: 150, title: '鐢熶骇鏁伴噺' }
+                  , { field: '浠诲姟鍗曟暟閲�', width: 150, title: '浠诲姟鍗曟暟閲�' }
+                  , { field: '璁㈠崟璺熻釜鍙�', width: 150, title: '璁㈠崟璺熻釜鍙�' }
                   , { field: '璁″垝寮�宸ユ棩鏈�', width: 150, title: '璁″垝寮�宸ユ棩鏈�' }
                   , { field: '璁″垝瀹屽伐鏃ユ湡', width: 150, title: '璁″垝瀹屽伐鏃ユ湡' }
-                  , { field: '鏈�杩熷紑宸ユ棩鏈�', width: 150, title: '鏈�杩熷紑宸ユ棩鏈�' }
-                  , { field: '鏈�杩熷畬宸ユ棩鏈�', width: 150, title: '鏈�杩熷畬宸ユ棩鏈�' }
-                  , { field: '鍏宠仈鏁伴噺', width: 150, title: '鍏宠仈鏁伴噺' }
-                  , { field: '婧愬崟鍗曞彿', width: 150, title: '婧愬崟鍗曞彿' }
-                  , { field: '婧愬崟涓诲唴鐮�', width: 150, title: '婧愬崟涓诲唴鐮�' }
-                  , { field: '婧愬崟瀛愬唴鐮�', width: 150, title: '婧愬崟瀛愬唴鐮�' }
-                  , { field: '鏈叧鑱旀暟閲�', width: 150, title: '鏈叧鑱旀暟閲�' }
+                  , { field: '鎽樿', width: 150, title: '鎽樿' }
+                  , { field: '鍐呴儴鍗曟嵁鍙�', width: 150, title: '鍐呴儴鍗曟嵁鍙�' }
+                  , { field: '濮斿璁㈠崟鍐呯爜', width: 150, title: '濮斿璁㈠崟鍐呯爜' }
+                  , { field: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, title: '濮斿璁㈠崟瀛愬唴鐮�' }
+                  , { field: '濮斿璁㈠崟鍙�', width: 150, title: '濮斿璁㈠崟鍙�' }
+                  , { field: '渚涘簲鍟嗕唬鐮�', width: 150, title: '渚涘簲鍟嗕唬鐮�' }
+                  , { field: '渚涘簲鍟�', width: 150, title: '渚涘簲鍟�' }
+                  , { field: '濮斿鍔犲伐鍗曚綅', width: 150, title: '濮斿鍔犲伐鍗曚綅' }
+                  , { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
+                  , { field: '宸ュ簭鍙�', width: 150, title: '宸ュ簭鍙�' }
+                  , { field: '宸ュ簭浠g爜', width: 150, title: '宸ュ簭浠g爜' }
+                  , { field: '宸ュ簭', width: 150, title: '宸ュ簭' }
+                  , { field: '鍔犲伐璇存槑', width: 150, title: '鍔犲伐璇存槑' }
+                  , { field: '宸ヤ綔涓績浠g爜', width: 150, title: '宸ヤ綔涓績浠g爜' }
+                  , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
+                  , { field: '鍔犲伐杞﹂棿浠g爜', width: 150, title: '鍔犲伐杞﹂棿浠g爜' }
+                  , { field: '鍔犲伐杞﹂棿', width: 150, title: '鍔犲伐杞﹂棿' }
+                  , { field: '鐝粍浠g爜', width: 150, title: '鐝粍浠g爜' }
+                  , { field: '鐝粍', width: 150, title: '鐝粍' }
+                  , { field: '鎿嶄綔宸ヤ唬鐮�', width: 150, title: '鎿嶄綔宸ヤ唬鐮�' }
+                  , { field: '鎿嶄綔宸�', width: 150, title: '鎿嶄綔宸�' }
+                  , { field: '鐢熶骇璧勬簮浠g爜', width: 150, title: '鐢熶骇璧勬簮浠g爜' }
+                  , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+                  , { field: '璁″垝鏁伴噺', width: 150, title: '璁″垝鏁伴噺' }
+                  , { field: '娴佽浆鍗℃暟閲�', width: 150, title: '娴佽浆鍗℃暟閲�' }
+                  , { field: '鏃堕棿鍗曚綅', width: 150, title: '鏃堕棿鍗曚綅' }
+                  , { field: '宸ュ簭璁″垝鍔犲伐鏃堕棿', width: 150, title: '宸ュ簭璁″垝鍔犲伐鏃堕棿' }
+                  , { field: '瀛愯鍒掑紑宸ユ棩鏈�', width: 150, title: '瀛愯鍒掑紑宸ユ棩鏈�' }
+                  , { field: '瀛愯鍒掑畬宸ユ棩鏈�', width: 150, title: '瀛愯鍒掑畬宸ユ棩鏈�' }
+                  , { field: '瀹為檯寮�宸ユ棩鏈�', width: 150, title: '瀹為檯寮�宸ユ棩鏈�' }
+                  , { field: '瀹為檯瀹屽伐鏃ユ湡', width: 150, title: '瀹為檯瀹屽伐鏃ユ湡' }
+                  , { field: '寮�宸ヤ綑閲忓ぉ鏁�', width: 150, title: '寮�宸ヤ綑閲忓ぉ鏁�' }
+                  , { field: '寮�宸ヤ綑閲忓浐鏁�', width: 150, title: '寮�宸ヤ綑閲忓浐鏁�' }
+                  , { field: '涓婇亾鍥哄畾澶╂暟', width: 150, title: '涓婇亾鍥哄畾澶╂暟' }
+                  , { field: '鐢熶骇鍛ㄦ湡', width: 150, title: '鐢熶骇鍛ㄦ湡' }
+                  , { field: '鍔犲伐鍗曚环', width: 150, title: '鍔犲伐鍗曚环' }
+                  , { field: '鍔犲伐璐圭敤閲戦', width: 150, title: '鍔犲伐璐圭敤閲戦' }
+                  , { field: '鏈亾宸ュ簭', width: 150, title: '鏈亾宸ュ簭' }
+                  , { field: '棣栭亾宸ュ簭', width: 150, title: '棣栭亾宸ュ簭' }
+                  , { field: '涓嬮亾娴佽浆宸ュ簭', width: 150, title: '涓嬮亾娴佽浆宸ュ簭' }
+                  , { field: '娴佽浆鏍囪', width: 150, title: '娴佽浆鏍囪' }
+                  , { field: '濮斿鏍囪', width: 150, title: '濮斿鏍囪' }
+                  , { field: '琛屽叧闂汉', width: 150, title: '琛屽叧闂汉' }
+                  , { field: '鍏抽棴绫诲瀷', width: 150, title: '鍏抽棴绫诲瀷' }
+                  , { field: '琛ㄤ綋澶囨敞', width: 150, title: '琛ㄤ綋澶囨敞' }
                   , { field: '鍒跺崟浜�', width: 150, title: '鍒跺崟浜�' }
                   , { field: '鍒跺崟鏃ユ湡', width: 150, title: '鍒跺崟鏃ユ湡' }
                   , { field: '瀹℃牳浜�', width: 150, title: '瀹℃牳浜�' }
@@ -121,8 +147,16 @@
                   , { field: '鍏抽棴鏃ユ湡', width: 150, title: '鍏抽棴鏃ユ湡' }
                   , { field: '浣滃簾浜�', width: 150, title: '浣滃簾浜�' }
                   , { field: '浣滃簾鏃ユ湡', width: 150, title: '浣滃簾鏃ユ湡' }
-                  , { field: '琛屽叧闂汉', width: 150, title: '琛屽叧闂汉' }
-                  , { field: '鍏抽棴绫诲瀷', width: 150, title: '鍏抽棴绫诲瀷' }
+                  , { field: '鎷嗗垎鏁伴噺', width: 150, title: '鎷嗗垎鏁伴噺' }
+                  , { field: '鍓╀綑鏁伴噺', width: 150, title: '鍓╀綑鏁伴噺' }
+                  , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', width: 150, title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
+                  , { field: '杩涚珯鍏宠仈鏁伴噺', width: 150, title: '杩涚珯鍏宠仈鏁伴噺' }
+                  , { field: '鍑虹珯鍏宠仈鏁伴噺', width: 150, title: '鍑虹珯鍏宠仈鏁伴噺' }
+                  , { field: '鎺掑簭鍙�', width: 150, title: '鎺掑簭鍙�' }
+                  , { field: '婧愬崟涓诲唴鐮�', width: 150, title: '婧愬崟涓诲唴鐮�' }
+                  , { field: '婧愬崟瀛愬唴鐮�', width: 150, title: '婧愬崟瀛愬唴鐮�' }
+                  , { field: '婧愬崟鍗曞彿', width: 150, title: '婧愬崟鍗曞彿' }
+                  , { field: '婧愬崟绫诲瀷', width: 150, title: '婧愬崟绫诲瀷' }
               ]]
               , page: true
             });

--
Gitblit v1.9.1