tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Chen Lily
2024-03-26 15:56:31 +08:00
parent 634e8b71ab
commit 0855ae42cd
547 changed files with 94818 additions and 60463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Site/MachineDeviceManagement/AssetMergeHistory.aspx
View File

@ -10,38 +10,7 @@
.selectinput {
width: 150px;
margin-right: 10px;
}
.dialog-content table {
border-collapse: collapse;
width: 100%;
}
.dialog-content table td.label {
width: 160px;
text-align: right;
padding-right: 10px;
line-height: 24px;
height: 24px;
vertical-align: top;
}
.dialog-content table td input,
.dialog-content table td textarea {
border: 1px solid #a9a9a9;
width: 200px;
height: 18px;
padding: 1px;
}
.dialog-content table td input[type="checkbox"] {
border: none;
}
.dialog-content table td textarea {
height: 100px;
max-width: 200px;
}
}
#dialogdatatb td {
padding-top: 30px;
@ -62,7 +31,6 @@
<link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
<script src="<%=GetFileUrlWithVersion("../Maintenance/js/inputdatactr.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
<script src="<%=GetFileUrlWithVersion("../js/editableselect.js")%>"></script>
<script type="text/javascript">
function assetrequest(method, param, callback, error) {
@ -107,7 +75,7 @@
else if (j === "MergeOn")
r[j] = { DisplayValue: r["MergeOnStr"], Value: r[j] };
else if (j === "Completed")
r[j] = { DisplayValue: r["Completed"] ? "Yes" : "No", Value: r[j] };
r[j] = { DisplayValue: r["Completed"] ? GetTextByKey("P_UTILITY_YES", "Yes") : GetTextByKey("P_UTILITY_NO", "No"), Value: r[j] };
else if (j === "FromAsset") {
r.FromAssetName = r["FromAsset"].Name;
r.FromAssetName2 = r["FromAsset"].Name2;
@ -127,8 +95,7 @@
r.ToAssetDisplayName = r["ToAsset"].DisplayName;
}
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_dt.setData(rows);
@ -136,13 +103,7 @@
var grid_dt;
function InitGridData() {
grid_dt = new GridView('#mergelist');
grid_dt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_dt = createGridView('#mergelist');
var list_columns = [
{ name: 'FromAssetDisplayName', caption: GetTextByKey("P_MA_FROMASSETNAME", "From Asset Name"), valueIndex: 'FromAssetDisplayName', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'FromAssetVIN', caption: GetTextByKey("P_MA_FROMASSETVIN", "From Asset VIN"), valueIndex: 'FromAssetVIN', css: { 'width': 180, 'text-align': 'left' } },
@ -168,10 +129,9 @@
col.allowFilter = list_columns[hd].allowFilter;
columns.push(col);
}
grid_dt.canMultiSelect = false;
grid_dt.multiSelect = false;
grid_dt.columns = columns;
grid_dt.init();
}