From 0ab2565c79c3f4207e2b3c36edb32a65e1af909e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:13 +0800
Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑； 1.生产资源 有异常； 删除有问题，删除后出来 异常数据( )； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 2.工序 ： 9999的 转工序 ， 有个 转工序 字段，是否没显示出来； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 3.工作中心： 其他信息 里的 几个字段 输入 字符时 报错，应提示； 4.生产班组： 刷新出来 异常数据； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 5.基础资料的 一些 复选框 标题不对； 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑； 7.工艺路线查询；工序号，工序代码，工序，工艺参数，表体备注， 其他的放后面 子表 的 委外标记 放到最后面去； 并且 把 供应商代码和供应商 放出来（也放在最后几个）； 8.部门有 很多异常数据； 选择的时候 出来了； 9.流转卡维护， 表头 很多没有用的列，单据号 日期 都没有显示； 转工序 是否要打印（跟客户确认）； 10. 流转卡拆分时，一些 列的 排序；
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 73 ++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 8 +
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 2
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 30 +++-
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 39 ++++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 10 +
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 2
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 13 ++
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 68 ++++++++++-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_CF.html | 46 ++++---
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 2
15 files changed, 251 insertions(+), 50 deletions(-)
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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index fe78ae2..b036b1a 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -106,7 +106,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline" style="">
- <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off" value="0">
+ <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
@@ -119,7 +119,12 @@
</button>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">鏌撹壊瑕佹眰</label>
+ <div class="layui-input-inline" style="">
+ <input class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" value="">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -704,6 +709,7 @@
, "HSTDMACHINEPREPARETIME": data.鏍囧噯鏈哄櫒鍑嗗宸ユ椂
, "HWidth": data.HWidth
, "HWeight": data.HWeight
+ , "HColorRemark": data.鏌撹壊瑕佹眰
});
console.log($('#HUnitGroupID').val());
} else {
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index 472e81e..ff2f6c8 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -581,7 +581,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">杞彮璋冧紤鏍囧織</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁璋冧紤">
+ <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁杞彮璋冧紤">
<input type="hidden" value="false" name="HShiftFlag" id="HShiftFlag">
</div>
</div>
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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
index 8ef5ea3..0ec1229 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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
@@ -127,7 +127,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">琛屼笟鏍囧噯</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDayMoney" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
+ <input class="layui-input" name="HDayMoney" lay-verify="HDayMoney" id="HDayMoney" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -337,6 +337,43 @@
// layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("宸ヤ綔鏃堕棿鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("宸ヤ綔鏃堕棿璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HQty = $('#HQty').val();
+ if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+ layer.msg("璁惧鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HQty)) {
+ layer.msg("璁惧鏁伴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HDayMoney = $('#HDayMoney').val();
+ if (HDayMoney.substring(HDayMoney.length - 1, HDayMoney.length) == ".") {
+ layer.msg("琛屼笟鏍囧噯鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HDayMoney)) {
+ layer.msg("琛屼笟鏍囧噯璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
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/xmlLBM_Sc_ProcessExchangeBillList.aspx" "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index d124981..9d17444 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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "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/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select b.娴佹按鍙�,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.澶囨敞2,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] +"order by cast(b.娴佹按鍙� as int)","select 1");
+ SqlXMLReportData.GenEntireData(this, "select b.娴佹按鍙�,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.澶囨敞2,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] +"order by cast(b.娴佹按鍙� as int)","select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index e8c5526..f26096e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -451,7 +451,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_FastQuery(1);
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index e870f2e..adf4b72 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -345,6 +345,19 @@
layer.msg("鍚嶇О涓嶈兘涓虹┖锛�");
return;
}
+
+ var HEmpQty = $('#HEmpQty').val();
+ if (HEmpQty.substring(HEmpQty.length - 1, HEmpQty.length) == ".") {
+ layer.msg("浜烘暟鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HEmpQty)) {
+ layer.msg("浜烘暟璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
//if ($("#HProcID").val()=="0") {
// layer.msg("璇烽�夋嫨宸ュ簭锛�");
// return;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 352bc34..611f3f6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -77,6 +77,13 @@
<input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杞爣蹇�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
+ <input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -126,7 +133,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鐝骇瀹氶</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HFixPrice" lay-verify="HFixPrice" id="HFixPrice" autocomplete="off">
+ <input class="layui-input" name="HFixPrice" lay-verify="HFixPrice" id="HFixPrice" value="0" autocomplete="off">
</div>
</div>
@@ -143,13 +150,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏉″舰鐮�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ <input class="layui-input" name="HBarCodeForBase" id="HBarCodeForBase" autocomplete="off">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">搴忓彿</label>
<div class="layui-input-inline">
- <input type="text" name="HSno" id="HSno" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HSno" id="HSno" lay-verify="" autocomplete="off" value="0" class="layui-input">
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
@@ -196,7 +203,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">娴佽浆鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHTypeFlow" id="checkboxHTypeFlow" lay-skin="primary" lay-filter="checkboxHTypeFlow" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHTypeFlow" id="checkboxHTypeFlow" lay-skin="primary" lay-filter="checkboxHTypeFlow" value="true" title="鏄惁娴佽浆">
<input type="hidden" value="false" name="HTypeFlow" id="HTypeFlow">
</div>
</div>
@@ -205,14 +212,14 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏍哥畻鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHTypeCount" id="checkboxHTypeCount" lay-skin="primary" lay-filter="checkboxHTypeCount" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHTypeCount" id="checkboxHTypeCount" lay-skin="primary" lay-filter="checkboxHTypeCount" value="true" title="鏄惁鏍哥畻">
<input type="hidden" value="false" name="HTypeCount" id="HTypeCount">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鑷姩绉昏浆</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHAutoTrunFlag" id="checkboxHAutoTrunFlag" lay-skin="primary" lay-filter="checkboxHAutoTrunFlag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHAutoTrunFlag" id="checkboxHAutoTrunFlag" lay-skin="primary" lay-filter="checkboxHAutoTrunFlag" value="true" title="鏄惁绉昏浆">
<input type="hidden" value="false" name="HAutoTrunFlag" id="HAutoTrunFlag">
</div>
</div>
@@ -378,6 +385,12 @@
$("#HStopflag").val(data.elem.checked);
});
+ //鏄惁杞伐搴�
+ form.on('checkbox(checkboxHTProcessFlag)', function (data) {
+ $("#HTProcessFlag").val(data.elem.checked);
+ });
+
+
//娴佽浆鏍囪鎸夐挳
form.on('checkbox(checkboxHTypeFlow)', function (data) {
$("#HTypeFlow").val(data.elem.checked);
@@ -495,6 +508,7 @@
var IsHTypeFlow = data.娴佽浆鏍囪;
var IsHTypeCount = data.鏍哥畻鏍囪;
var IsHAutoTrunFlag = data.鑷姩绉昏浆;
+ var HTProcessFlag = data.HTProcessFlag;
//绂佺敤鏍囪
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
@@ -508,6 +522,9 @@
if (IsHAutoTrunFlag) {
$("input[name='checkboxHAutoTrunFlag'][value='" + IsHAutoTrunFlag + "']").attr("checked", true);
}
+ if (HTProcessFlag) {
+ $("input[name='checkboxHTProcessFlag'][value='" + HTProcessFlag + "']").attr("checked", true);
+ }
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HNumber": data.宸ュ簭浠ｇ爜
, "HItemID": data.HItemID
@@ -516,7 +533,7 @@
, "HLevel": data.绛夌骇
//, "HProcMulName": data.宸ユ鍚嶇О
//, "HProcMulID": data.宸ユID
- , "HBarCode": data.鏉″舰鐮�
+ , "HBarCodeForBase": data.鏉″舰鐮�
, "HHelpCode": data.鍔╄鐮�
, "HDeptName": data.閮ㄩ棬
, "HDeptID": data.HDeptID
@@ -587,6 +604,43 @@
// layer.msg("璇烽�夋嫨ERP宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
+
+ var HFixPrice = $('#HFixPrice').val();
+ if (HFixPrice.substring(HFixPrice.length - 1, HFixPrice.length) == ".") {
+ layer.msg("鐝骇瀹氶鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HFixPrice)) {
+ layer.msg("鐝骇瀹氶璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HOverFixPrice = $('#HOverFixPrice').val();
+ if (HOverFixPrice.substring(HOverFixPrice.length - 1, HOverFixPrice.length) == ".") {
+ layer.msg("鍔犵彮琛ヨ创瀹氶鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HOverFixPrice)) {
+ layer.msg("鍔犵彮琛ヨ创瀹氶璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HSno = $('#HSno').val();
+ if (HSno.substring(HSno.length - 1, HSno.length) == ".") {
+ layer.msg("搴忓彿鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HSno)) {
+ layer.msg("搴忓彿璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 0ad3e54..2e294a9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -423,6 +423,79 @@
layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("鍗曠彮宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("鍗曠彮宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HRelationID = $('#HRelationID').val();
+ if (HRelationID.substring(HRelationID.length - 1, HRelationID.length) == ".") {
+ layer.msg("鍏宠仈ID鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HRelationID)) {
+ layer.msg("鍏宠仈ID璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HMaxWorkTimes = $('#HMaxWorkTimes').val();
+ if (HMaxWorkTimes.substring(HMaxWorkTimes.length - 1, HMaxWorkTimes.length) == ".") {
+ layer.msg("鍗曠彮鏈�澶у伐鏃剁殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HMaxWorkTimes)) {
+ layer.msg("鍗曠彮鏈�澶у伐鏃惰杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HMinAdd = $('#HMinAdd').val();
+ if (HMinAdd.substring(HMinAdd.length - 1, HMinAdd.length) == ".") {
+ layer.msg("鏈�灏忚繘闃剁殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HMinAdd)) {
+ layer.msg("鏈�灏忚繘闃惰杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HClassCount = $('#HClassCount').val();
+ if (HClassCount.substring(HClassCount.length - 1, HClassCount.length) == ".") {
+ layer.msg("姣忔棩鐝鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HClassCount)) {
+ layer.msg("姣忔棩鐝璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HOverTimes = $('#HOverTimes').val();
+ if (HOverTimes.substring(HOverTimes.length - 1, HOverTimes.length) == ".") {
+ layer.msg("鍔犵彮宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HOverTimes)) {
+ layer.msg("鍔犵彮宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field) + ";" +sessionStorage["HUserName"];
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 780c551..ff2fe13 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -465,7 +465,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_FastQuery(1);
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 938cbdd..eae4add 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -369,7 +369,7 @@
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
+ get_FastQuery(1);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
index ddcb0b8..fbeea67 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
@@ -238,6 +238,12 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏌撹壊瑕佹眰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
<div class="layui-input-block" style="margin-left: 115px;">
<input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
@@ -743,6 +749,7 @@
$("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
$("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
$("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
+ $("#HColorRemark").val(checkStatus.data[0].鏌撹壊瑕佹眰);//鍏嬮噸
$("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -971,6 +978,7 @@
, "HAuxUnitName": d.data[0].HAuxUnitName
, "HWidth": d.data[0].HWidth
, "HWeight": d.data[0].HWeight
+ , "HColorRemark": d.data[0].鏌撹壊瑕佹眰
//鍏朵粬淇℃伅
, "hmakers": d.data[0].鍒跺崟浜�
, "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index 234bb2b..7ae843a 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -159,7 +159,7 @@
var option2 = [];
var HModName = "Gy_RoutingBillListQuery";
var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "宸ヤ綔", "HMainProcID", "宸ュ簭鍚嶇О", "涓昏繍琛屾椂闂�", "杩愯鏃堕棿鍗曚綅", "涓诲姞宸ユ暟閲�", "鏉愯川", "鍥惧彿鐗堟湰", "HMainGroupID", "鐝粍", "宸ヤ环", "鏍囧噯璧勬簮鏁�", "鍔犺祫婧愬閲�", "鍑忚祫婧愬噺閲�", "HItemID", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName", "渚涘簲鍟嗕唬鐮�","渚涘簲鍟�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#endregion
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index c50da7c..0104337 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -87,18 +87,24 @@
<input type="datetime" class="layui-input" name="HDate" id="HDate">
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏌撹壊瑕佹眰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍥惧彿鐗堟湰</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">鍥惧彿鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -1018,7 +1024,7 @@
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
, { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
, { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6" }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
@@ -2023,6 +2029,7 @@
, "HEmpName": data.涓氬姟鍛�
, "HCusID": data.HCusID
, "HCusNames": data.瀹㈡埛
+ , "HColorRemark": data.鏌撹壊瑕佹眰
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
@@ -2357,6 +2364,7 @@
$("#HEmpName").val(data.涓氬姟鍛�);
$("#HCusID").val(data.HCusID);
$("#HCusNames").val(data.瀹㈡埛);
+ $("#HColorRemark").val(data.鏌撹壊瑕佹眰);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index b65a993..4a2a0d9 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -203,7 +203,7 @@
//
var HModName = "Sc_ProcessExchangeBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
- var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit"];
+ var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "鏉愯川", "鎴愬搧缂栧彿", "鐗堟湰", "鎬昏鍥惧彿", "鍥惧彿鐗堟湰", "瀛愪欢浠ｇ爜", "瀛愪欢鍚嶇О", "瀛愪欢瑙勬牸", "鎵瑰彿", "濮斿鍔犲伐鍗曚綅浠ｇ爜", "濮斿鍔犲伐鍗曚綅", "璁惧鍚嶇О", "璁惧浠ｇ爜", "鍘熸枡鎵规", "琛ユ枡鏍囪", "椤圭洰缂栧彿", "涓昏鏉愭枡", "鍏抽敭鏉愭枡", "浜у搧CODE", "閿�鍞鍗曞彿", "瀹㈡埛绠�绉�", "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎", "浜у搧鍚嶇О2", "瀹㈡埛鍚嶇О", "鐢熶骇澶囨敞", "閲嶈鎻愮ず", "鍘熸潗鏂欑紪鍙稟", "鍘熸潗鏂欑紪鍙稡", "鍘熸潗鏂欑紪鍙稢", "鍘熸潗鏂欑紪鍙稤", "鍘熸潗鏂欏唴鐮丄", "鍘熸潗鏂欏唴鐮丅", "鍘熸潗鏂欏唴鐮丆", "鍘熸潗鏂欏唴鐮丏", "鏃ヨ鍒掑伐鍗曞彿", "瀹㈡埛缂栫爜", "鑺綋瑙勬牸鍨嬪彿", "鑺綋鐗╂枡浠ｇ爜", "婧愬崟瀹㈡埛浠ｇ爜", "HEmpID","HCusID"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮乫", "鎿嶄綔宸�", "HSourceID", "鐢熶骇璧勬簮浠ｇ爜", "鐢熶骇璧勬簮", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "鎵瑰彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
index d05013d..ddb80a7 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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
@@ -327,32 +327,34 @@
, { field: 'HProcID', title: '宸ュ簭ID', hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', width: 120 }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 120 }
- , { field: 'HBackProc', title: '杩斿伐鏍囧織', templet: "#HBackProc", width: 120 }
+ , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
+ , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', width: 120 }
+ , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О', width: 120 }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 120, edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
, { field: 'HLeftQty', title: '鍙媶鍒嗘暟閲�', width: 120 }
, { field: 'HSplitQty', title: '鎷嗗垎鏁伴噺', width: 120, edit: 'text' }
, { field: 'HQty', title: '瀹為檯鏁伴噺', width: 120 }
, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', width: 120 }
- , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
- , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', width: 120}
- , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О', width: 120 }
- , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', width: 120}
- , { field: 'HDeptName', title: '閮ㄩ棬', width: 120}
- , { field: 'HGroupID', title: '鐝粍ID', hide: true }
- , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', width: 120 }
- , { field: 'HGroupName', title: '鐝粍', width: 120}
- , { field: 'HWorkerID', title: 'HWorkerID', hide: true }
- , { field: 'HWorkerNumber', title: '鎿嶄綔鍛樹唬鐮�', width: 120 }
- , { field: 'HWorkerName', title: '鎿嶄綔鍛�', width: 120 }
- , { field: 'HOutPrice', title: '鍔犲伐鍗曚环', width: 120 }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
- , { field: 'HOverRate', title: '瓒呴姣斾緥', width: 120 }
- , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', width: 120}
- , { field: 'HPassRate', title: '鑹巼', width: 120}
- , { field: 'HSumPassRate', title: '绱鑹巼', width: 120}
- , { field: 'HPicNum', title: '鍥剧焊缂栧彿', width: 120 }
- , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 120}
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 120 }
+ , { field: 'HBackProc', title: '杩斿伐鏍囧織', templet: "#HBackProc", width: 120 }
+
+ //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+ //, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', width: 120}
+ //, { field: 'HDeptName', title: '閮ㄩ棬', width: 120}
+ //, { field: 'HGroupID', title: '鐝粍ID', hide: true }
+ //, { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', width: 120 }
+ //, { field: 'HGroupName', title: '鐝粍', width: 120}
+ //, { field: 'HWorkerID', title: 'HWorkerID', hide: true }
+ //, { field: 'HWorkerNumber', title: '鎿嶄綔鍛樹唬鐮�', width: 120 }
+ //, { field: 'HWorkerName', title: '鎿嶄綔鍛�', width: 120 }
+ //, { field: 'HOutPrice', title: '鍔犲伐鍗曚环', width: 120 }
+ //, { field: 'HOverRate', title: '瓒呴姣斾緥', width: 120 }
+ //, { field: 'HMaxQty', title: '鏈�楂樹笂闄�', width: 120}
+ //, { field: 'HPassRate', title: '鑹巼', width: 120}
+ //, { field: 'HSumPassRate', title: '绱鑹巼', width: 120}
+ //, { field: 'HPicNum', title: '鍥剧焊缂栧彿', width: 120 }
+ //, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 120}
+
, { field: 'HPrevSourceInterID', title: 'HPrevSourceInterID', hide: true }
, { field: 'HPrevSourceEntryID', title: 'HPrevSourceEntryID', hide: true }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
--
Gitblit v1.9.1