From d682a361ec0650dedd90a6579945784ed616ea4e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 03 一月 2023 11:02:35 +0800
Subject: [PATCH] 修复
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapRequestBillList.html | 4 ++--
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_Out.html | 4 ++--
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsBillList.html | 4 ++--
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsChangeBillList.html | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapRequestBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapRequestBillList.html"
index ec1c64e..99c4000 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapRequestBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapRequestBillList.html"
@@ -178,7 +178,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
, { field: 'HEmpID', title: 'HEmpID', sort: true, width: 165, hide: true }
, { field: '鐢宠浜�', title: '鐢宠浜�', sort: true, width: 165 }
@@ -423,7 +423,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "HEmpID", "HMangerID", "HDeptID", "HMaterID", "HPropertyID", "HSecUnitID","HWHID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEmpID", "HMangerID", "HDeptID", "HMaterID", "HPropertyID", "HSecUnitID","HWHID","HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html"
index b354755..726375a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html"
@@ -71,7 +71,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HItemID" id="HItemID" lay-verify="HItemID">
+ <input type="hidden" name="HItemID" id="HItemID" lay-verify="HItemID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -351,7 +351,6 @@
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -840,6 +839,7 @@
//涓昏〃
form.val("formData", {
"HBarCode": d.data[0].鏉″舰鐮�
+ , "HItemID": d.data[0].HMainID
, "HInterID": d.data[0].HMainID
, "HProcID": d.data[0].HProcID
, "HProcName": d.data[0].宸ュ簭
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html"
index 9632ffb..3d35d9b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html"
@@ -195,8 +195,8 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
, { field: '閮ㄤ綅', title: '閮ㄤ綅', width: 160 }
- , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 160 }
- , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 160 }
+ , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 120, templet: "<div>{{d.寮�濮嬫椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬫椂闂�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 120, templet: "<div>{{d.鏈夋晥鏈熻嚦 ==null ?'':layui.util.toDateString(d.鏈夋晥鏈熻嚦, 'yyyy-MM-dd')}}</div>" }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
]]
};
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
index 93b356e..9cb728b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
@@ -195,8 +195,8 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
, { field: '閮ㄤ綅', title: '閮ㄤ綅', width: 160 }
- , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 160 }
- , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 160 }
+ , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 120, templet: "<div>{{d.寮�濮嬫椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬫椂闂�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 120, templet: "<div>{{d.鏈夋晥鏈熻嚦 ==null ?'':layui.util.toDateString(d.鏈夋晥鏈熻嚦, 'yyyy-MM-dd')}}</div>" }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
]]
};
--
Gitblit v1.9.1