Skip to content

T
traffic-front
Commit ca1a6046 authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent 69f01997
Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 274 deletions
atms-web/src/main/webapp/app-resources/i18n/en-us/taxDocumentList.json
View file @ ca1a6046
{ {
"DocumentAttr":"DocumentAttr", "Document Attribute":"Document Attribute",
"DocumentType":"DocumentType", "Document Type":"Document Type",
"DocumentName":"DocumentName", "Document Name":"Document Name",
"IsRequired":"Is Required", "IsRequired":"Is Required",
"PleaseChecksRequired":"Please Checks Required", "PleaseChecksRequired":"Please Checks Required",
"BusinessLine":"BusinessLine", "Business Line":"Business Line",
"CorporationName":"CorporationName", "Company Name":"Company Name",
"AvailabilityDate":"AvailabilityDate", "Effective_Date":"Effective_Date",
"Duration":"Duration", "Period":"Period",
"DueDate":"DueDate", "Due Date":"Due Date",
"TaxType":"TaxType", "Tax Type":"Tax Type",
"EntityIndex":"EntityIndex", "Storage Index":"Storage Index",
"EntityStorageLocation":"EntityStorageLocation", "Storage Location":"Storage Location",
"EntityCustodian":"EntityCustodian", "Custodian":"Custodian",
"ApprovalStatus":"ApprovalStatus", "Approval Status":"Approval Status",
"ApprovalPass":"ApprovalPass", "ApprovalPass":"ApprovalPass",
"ApprovalReject":"ApprovalReject", "ApprovalReject":"ApprovalReject",
"ApprovalStandby":"ApprovalStandby", "ApprovalStandby":"ApprovalStandby",
"UploadDate":"UploadDate", "Upload Date":"Upload Date",
"Creator":"Creator", "Creator":"Creator",
"Remarks":"Remarks", "Remarks":"Remarks",
"MoreFields":"MoreFields", "More":"More",
"LessFields":"LessFields", "Less":"Less",
"Search":"Search", "Search":"Search",
"Reset":"Reset", "Reset":"Reset",
"Preview":"Preview", "Preview":"Preview",
"DelRecord":"DelRecord", "Delete Record":"Delete Record",
"CreateRecord":"CreateRecord", "Create Record":"Create Record",
"ExportTable":"ExportTable", "Export Record":"Export Record",
"DownloadAttachment":"DownloadAttachment", "Download Attachment":"Download Attachment",
"Log":"Log", "Log":"Log",
"MultiUpload":"MultiUpload", "Multiple File Upload":"Multiple File Upload",
"MultiUploadFailList":"MultiUploadFailList", "MultiUploadFailList":"MultiUploadFailList",
"UnFile":"UnFile", "UnFile":"UnFile",
"UnRecord":"UnRecord", "UnRecord":"UnRecord",
...@@ -44,18 +44,20 @@ ...@@ -44,18 +44,20 @@
"Edited":"Edited", "Edited":"Edited",
"Created":"Created", "Created":"Created",
"CoverConfirm":"CoverConfirm", "CoverConfirm":"CoverConfirm",
"NoData":"NoData", "No Data":"No Data",
"PleaseSelected":"PleaseSelected", "Please Select":"Please Select",
"PleaseType":"PleaseType", "Please Type":"Please Type",
"Tips":"Tips", "Tips":"Tips",
"EntityStorageDescription":"EntityStorageDescription", "EntityStorageDescription":"EntityStorageDescription",
"multiUpload":"multiUpload", "multiUpload":"multiUpload",
"UploadAttach":"UploadAttach", "UploadAttach":"UploadAttach",
"Edit":"Edit", "Edit":"Edit",
"DocumentPath":"DocumentPath", "Document Path":"Document Path",
"PreviewFile":"PreviewFile", "PreviewFile":"PreviewFile",
"UploadSuccessCount":"UploadSuccessCount", "UploadSuccessCount":"UploadSuccessCount",
"UploadFailCount":"UploadFailCount", "UploadFailCount":"UploadFailCount",
"DeleteConfirm":"DeleteConfirm", "Confirm delete":"Confirm delete",
"FileTimeDateRangeError":"FileTimeDateRangeError" "FileTimeDateRangeError":"FileTimeDateRangeError",
"Warning":"Warning",
"Page {0} of {1} ({2} items)":"Page {0} of {1} ({2} items)"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/taxDocumentList.json
View file @ ca1a6046
{ {
"DocumentAttr":"档案属性", "Document Attribute":"档案属性",
"Document":"档案", "Document":"档案",
"IsRequired":"为必填字段，不能为空，请检查", "IsRequired":"为必填字段，不能为空，请检查",
"PleaseChecksRequired":"请检查必填字段", "PleaseChecksRequired":"请检查必填字段",
"DocumentType":"档案类型", "Document Type":"档案类型",
"DocumentName":"档案名称", "Document Name":"档案名称",
"BusinessLine":"业务线", "Business Line":"业务线",
"CorporationName":"公司名称", "Company Name":"公司名称",
"AvailabilityDate":"文件生效日期", "Effective_Date":"文件生效日期",
"Duration":"所属期间", "Period":"所属期间",
"DueDate":"到期日", "Due Date":"到期日",
"TaxType":"税种", "Tax Type":"税种",
"EntityIndex":"实物索引号", "Storage Index":"实物索引号",
"EntityStorageLocation":"实物存放地点", "Storage Location":"实物存放地点",
"EntityCustodian":"保管人", "Custodian":"保管人",
"ApprovalStatus":"审批状态", "Approval Status":"审批状态",
"ApprovalPass":"审批通过", "ApprovalPass":"审批通过",
"ApprovalReject":"拒绝审批", "ApprovalReject":"拒绝审批",
"ApprovalStandby":"待审批", "ApprovalStandby":"待审批",
"UploadDate":"上传日期", "Upload Date":"上传日期",
"Creator":"创建人", "Creator":"创建人",
"Remarks":"档案备注", "Remarks":"档案备注",
"MoreFields":"查看更多", "More":"查看更多",
"LessFields":"收起", "Less":"收起",
"Search":"查询", "Search":"查询",
"Reset":"重置", "Reset":"重置",
"Preview":"预览", "Preview":"预览",
"DelRecord":"删除记录", "Delete Record":"删除记录",
"CreateRecord":"新建记录", "Create Record":"新建记录",
"ExportTable":"导出列表", "Export Record":"导出列表",
"DownloadAttachment":"下载附件", "Download Attachment":"下载附件",
"Log":"日志", "Log":"日志",
"MultiUpload":"批量上传", "Multiple File Upload":"批量上传",
"MultiUploadFailList":"批量上传失败列表", "MultiUploadFailList":"批量上传失败列表",
"UnFile":"未支持的文件类型", "UnFile":"未支持的文件类型",
"UnRecord":"当前记录没有附件信息", "UnRecord":"当前记录没有附件信息",
...@@ -46,17 +46,19 @@ ...@@ -46,17 +46,19 @@
"Created":"新建成功", "Created":"新建成功",
"CoverConfirm":"当前记录已经存在，是否进行覆盖？", "CoverConfirm":"当前记录已经存在，是否进行覆盖？",
"NoData":"当前无数据可下载", "NoData":"当前无数据可下载",
"PleaseSelected":"请选择", "Please Select":"请选择",
"PleaseType":"请输入", "Please Type":"请输入",
"Tips":"提示讯息", "Tips":"提示讯息",
"EntityStorageDescription":"请将实物档案存放地址精确到某个档案柜", "EntityStorageDescription":"请将实物档案存放地址精确到某个档案柜",
"multiUpload":"批量上传", "multiUpload":"批量上传",
"UploadAttach":"上传附件", "UploadAttach":"上传附件",
"Edit":"编辑", "Edit":"编辑",
"DocumentPath":"档案路径", "Document Path":"档案路径",
"PreviewFile":"预览文件", "PreviewFile":"预览文件",
"UploadSuccessCount":"个档案上传成功:", "UploadSuccessCount":"个档案上传成功:",
"UploadFailCount":"个档案上传失败:", "UploadFailCount":"个档案上传失败:",
"DeleteConfirm":"是否确认删除记录？", "Confirm delete":"是否确认删除记录？",
"FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'" "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'",
"Warning":"提示",
"Page {0} of {1} ({2} items)":"当前 {0}页 /共 {1}页 ({2} 项)"
} }
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
View file @ ca1a6046
...@@ -78,7 +78,7 @@ frameworkModule.controller('appUsrOperateLogController', ...@@ -78,7 +78,7 @@ frameworkModule.controller('appUsrOperateLogController',
}, },
pager: { pager: {
allowedPageSizes: 5, allowedPageSizes: 5,
infoText: "当前 {0}页 /共 {1}页 ({2} 项)", infoText:$translate.instant('Page {0} of {1} ({2} items)'),
showInfo: true, showInfo: true,
showNavigationButtons: true, showNavigationButtons: true,
showPageSizeSelector: true, showPageSizeSelector: true,
......
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.html
View file @ ca1a6046
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<button class="btn log-export-btn" ng-click="exportTableData()"> <button class="btn log-export-btn" ng-click="exportTableData()">
<i class="fa fa-file-excel-o"></i> <i class="fa fa-file-excel-o"></i>
<span translate="ExportTable"></span> <span translate="Export Record"></span>
</button> </button>
<div dx-data-grid="dataGridOptions"></div> <div dx-data-grid="dataGridOptions"></div>
</div> </div>
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ ca1a6046
...@@ -55,27 +55,31 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -55,27 +55,31 @@ taxDocumentManageModule.controller('taxDocumentListController',
}; };
function checkReminder() { function checkReminder() {
var items = $scope.queryFieldModel; var items=$scope.queryFieldModel;
var message = ""; var message="";
if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) && if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
items.fileBeginTime > items.fileEndTTime) { items.fileBeginTime > items.fileEndTTime)
message += $translate.instant('AvailabilityDate') + ","; {
message+=$translate.instant('Effective_Date')+",";
} }
if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) && if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
items.ownBeginTime > items.ownEndTime) { items.ownBeginTime > items.ownEndTime)
message += $translate.instant('Duration') + ","; {
message+=$translate.instant('Duration')+",";
} }
if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) && if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
items.effectiveBeginTime > items.effectiveEndTime) { items.effectiveBeginTime > items.effectiveEndTime)
message += $translate.instant('DueDate') + ","; {
message+=$translate.instant('Due Date')+",";
} }
if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) && if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
items.uploadBeginTime > items.uploadEndTime) { items.uploadBeginTime > items.uploadEndTime)
message += $translate.instant('UploadDate') + ","; {
message+=$translate.instant('Upload Date')+",";
} }
if (message) { if(message){
message = (message.substring(message.length - 1) == ',') ? message.substring(0, message.length - 1) : message; message = (message.substring(message.length - 1) == ',') ? message.substring(0, message.length - 1) : message;
message += "-" + $translate.instant('DateWarningSearch'); message+="-"+$translate.instant('DateWarningSearch');
window.swal(message); window.swal(message);
return; return;
} }
...@@ -153,38 +157,38 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -153,38 +157,38 @@ taxDocumentManageModule.controller('taxDocumentListController',
}, },
{ {
dataField: "fileAttr", dataField: "fileAttr",
caption: $translate.instant('DocumentAttr'), caption: $translate.instant('Document Attribute'),
}, },
{ {
dataField: "fileType", dataField: "fileType",
caption: $translate.instant('DocumentType'), caption: $translate.instant('Document Type'),
}, },
{ {
dataField: "fileName", dataField: "fileName",
caption: $translate.instant('DocumentName'), caption: $translate.instant('Document Name'),
}, },
{ {
dataField: "businessLine", dataField: "businessLine",
caption: $translate.instant('BusinessLine'), caption: $translate.instant('Business Line'),
}, },
{ {
dataField: "companyName", dataField: "companyName",
caption: $translate.instant('CorporationName'), caption: $translate.instant('Company Name'),
}, },
{ {
dataField: "taxType", dataField: "taxType",
caption: $translate.instant('TaxType'), caption: $translate.instant('Tax Type'),
}, },
{ {
dataField: "fileTime", dataField: "fileTime",
caption: $translate.instant('AvailabilityDate'), caption: $translate.instant('Effective_Date'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
...@@ -201,7 +205,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -201,7 +205,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
}, },
{ {
dataField: "ownTime", dataField: "ownTime",
caption: $translate.instant('Duration'), caption: $translate.instant('Period'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
if (options.data.ownTime) { if (options.data.ownTime) {
...@@ -209,6 +213,8 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -209,6 +213,8 @@ taxDocumentManageModule.controller('taxDocumentListController',
// var ownTimeString = options.data.ownTime + ""; // var ownTimeString = options.data.ownTime + "";
// var year = ownTimeString.substr(0, 4); // var year = ownTimeString.substr(0, 4);
// var mon = ownTimeString.substr(4, 2); // var mon = ownTimeString.substr(4, 2);
//
// $scope.editFieldModel.ownTime = $scope.queryOwnTime(params.ownTime,"/");
$('<span>').text($scope.queryOwnTime(options.data.ownTime, "/")).appendTo(container); $('<span>').text($scope.queryOwnTime(options.data.ownTime, "/")).appendTo(container);
} else { } else {
$('<span>').text('').appendTo(container); $('<span>').text('').appendTo(container);
...@@ -220,7 +226,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -220,7 +226,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
}, },
{ {
dataField: "effectiveTime", dataField: "effectiveTime",
caption: $translate.instant('DueDate'), caption: $translate.instant('Due Date'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
...@@ -237,7 +243,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -237,7 +243,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
}, },
{ {
dataField: "auditStatus", dataField: "auditStatus",
caption: $translate.instant('ApprovalStatus'), caption: $translate.instant('Approval Status'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
var content = $scope.transformAuditStatusToView(options.data.auditStatus); var content = $scope.transformAuditStatusToView(options.data.auditStatus);
...@@ -251,22 +257,22 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -251,22 +257,22 @@ taxDocumentManageModule.controller('taxDocumentListController',
}, },
{ {
dataField: "physicalIndexNumber", dataField: "physicalIndexNumber",
caption: $translate.instant('EntityIndex'), caption: $translate.instant('Storage Index'),
}, },
{ {
dataField: "storageArea", dataField: "storageArea",
caption: $translate.instant('EntityStorageLocation'), caption: $translate.instant('Storage Location'),
}, },
{ {
dataField: "keeper", dataField: "keeper",
caption: $translate.instant('EntityCustodian'), caption: $translate.instant('Custodian'),
}, },
{ {
dataField: "uploadTime", dataField: "uploadTime",
caption: $translate.instant('UploadDate'), caption: $translate.instant('Upload Date'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
if (options.data.uploadTime) { if (options.data.uploadTime) {
...@@ -297,17 +303,6 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -297,17 +303,6 @@ taxDocumentManageModule.controller('taxDocumentListController',
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
// var prevTargetString = '<a style="color:#506bf7;margin-right:1rem;" href="javascript:void(0)" ng-click="viewRemoteFile(\''
// + options.data.fileName + '\',\'' + encodeURIComponent(options.data.filePositionUrl)
// + '\')">'
// + '<span>{{"Preview"|translate}}</span></a>';
// var editTargetString = '<a style="color:#506bf7;" href="javascript:void(0)" ng-click="openSimpleUploadPop(\''
// + options.data.id
// + '\')">'
// + '<span>{{"Edit"|translate}}</span></a>';
// var eventTarget = $(prevTargetString + editTargetString);
// $compile(eventTarget)($scope);
// container.append(eventTarget);
var prevTarget = $('<a style="color:#506bf7;margin-right:1rem;" href="javascript:void(0)"><span>' + $translate.instant('Preview') + '</span></a>'); var prevTarget = $('<a style="color:#506bf7;margin-right:1rem;" href="javascript:void(0)"><span>' + $translate.instant('Preview') + '</span></a>');
prevTarget.off('click').on('click', function () { prevTarget.off('click').on('click', function () {
$scope.viewRemoteFile(options.data.fileName, options.data.filePositionUrl); $scope.viewRemoteFile(options.data.fileName, options.data.filePositionUrl);
...@@ -441,6 +436,13 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -441,6 +436,13 @@ taxDocumentManageModule.controller('taxDocumentListController',
//弹出框 //弹出框
$scope.isCreatePop = false; $scope.isCreatePop = false;
var openSimpleUploadPop = function (rowId) { var openSimpleUploadPop = function (rowId) {
//清空标红*
if($scope.requiredField && $scope.requiredField.length>0){
for (var x in $scope.requiredField)
{
$scope.requiredField[x]="";
}
}
$scope.uploader.clearQueue(); $scope.uploader.clearQueue();
$("#uploadFilePlugin").val(null); $("#uploadFilePlugin").val(null);
// 带ID的就是编辑窗口 // 带ID的就是编辑窗口
...@@ -711,8 +713,8 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -711,8 +713,8 @@ taxDocumentManageModule.controller('taxDocumentListController',
SweetAlert.warning($translate.instant("NeedChecked")); SweetAlert.warning($translate.instant("NeedChecked"));
} else { } else {
SweetAlert.swal({ SweetAlert.swal({
title: '提示', title: $translate.instant("Warning"),
text: $translate.instant("DeleteConfirm"), text: $translate.instant("Confirm delete"),
type: "warning", type: "warning",
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#DD6B55",
...@@ -743,6 +745,19 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -743,6 +745,19 @@ taxDocumentManageModule.controller('taxDocumentListController',
} }
}; };
$(document).ready(function (e) {
var counter = 0;
if (window.history && window.history.pushState) {
window.onpopstate = function () {
window.history.pushState('forward', null, '#');
window.history.forward(1);
location.replace(document.referrer);//刷新
};
}
//在IE中必须得有这两行
window.history.pushState('forward', null, '#');
window.history.forward(1);
});
(function initialize() { (function initialize() {
$scope.editFieldModel = {}; $scope.editFieldModel = {};
$scope.uploader = {}; $scope.uploader = {};
...@@ -1205,45 +1220,46 @@ taxDocumentManageModule.directive('multiFileUploader', function () { ...@@ -1205,45 +1220,46 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
// return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1; // return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1;
// }; // };
if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) && if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) &&
modelItem.fileTime > modelItem.effectiveTime) { modelItem.fileTime > modelItem.effectiveTime)
alertText = $translate.instant("Document") + (i + 1) + "," + "【" + $translate.instant('FileTimeDateRangeError') + "】"; {
alertText = $translate.instant("Document") + (i + 1) + "," + "【"+$translate.instant('FileTimeDateRangeError')+"】";
break; break;
} }
if (!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))) { if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){
alertText += "【" + $translate.instant("CompanyName") + "】" alertText += "【"+$translate.instant("CompanyName")+"】"
} }
if (!modelItem.fileType && $scope.isRequired($translate.instant("DocumentType"))) { if(!modelItem.fileType && $scope.isRequired($translate.instant("Document Type"))){
alertText += "【" + $translate.instant("DocumentType") + "】" alertText += "【"+$translate.instant("Document Type")+"】"
} }
if (!modelItem.fileAttr && $scope.isRequired($translate.instant("DocumentAttr"))) { if(!modelItem.fileAttr && $scope.isRequired($translate.instant("Document Attribute"))){
alertText += "【" + $translate.instant("DocumentAttr") + "】" alertText += "【"+$translate.instant("Document Attribute")+"】"
} }
if (!modelItem.taxType && $scope.isRequired($translate.instant("TaxType"))) { if(!modelItem.taxType && $scope.isRequired($translate.instant("Tax Type"))){
alertText += "【" + $translate.instant("TaxType") + "】" alertText += "【"+$translate.instant("Tax Type")+"】"
} }
if (!modelItem.ownTime && $scope.isRequired($translate.instant("Duration"))) { if(!modelItem.ownTime && $scope.isRequired($translate.instant("Duration"))){
alertText += "【" + $translate.instant("Duration") + "】" alertText += "【"+$translate.instant("Duration")+"】"
} }
if (!modelItem.fileTime && $scope.isRequired($translate.instant("AvailabilityDate"))) { if(!modelItem.fileTime && $scope.isRequired($translate.instant("Effective_Date"))){
alertText += "【" + $translate.instant("AvailabilityDate") + "】" alertText += "【"+$translate.instant("Effective_Date")+"】"
} }
if (!modelItem.effectiveTime && $scope.isRequired($translate.instant("DueDate"))) { if(!modelItem.effectiveTime && $scope.isRequired($translate.instant("Due Date"))){
alertText += "【" + $translate.instant("DueDate") + "】" alertText += "【"+$translate.instant("Due Date")+"】"
} }
if (!modelItem.keeper && $scope.isRequired($translate.instant("EntityCustodian"))) { if(!modelItem.keeper && $scope.isRequired($translate.instant("Custodian"))){
alertText += "【" + $translate.instant("EntityCustodian") + "】" alertText += "【"+$translate.instant("Custodian")+"】"
} }
if (!modelItem.storageArea && $scope.isRequired($translate.instant("EntityStorageLocation"))) { if(!modelItem.storageArea && $scope.isRequired($translate.instant("Storage Location"))){
alertText += "【" + $translate.instant("EntityStorageLocation") + "】" alertText += "【"+$translate.instant("Storage Location")+"】"
} }
if (!modelItem.physicalIndexNumber && $scope.isRequired($translate.instant("EntityIndex"))) { if(!modelItem.physicalIndexNumber && $scope.isRequired($translate.instant("Storage Index"))){
alertText += "【" + $translate.instant("EntityIndex") + "】" alertText += "【"+$translate.instant("Storage Index")+"】"
} }
if (!modelItem.remark && $scope.isRequired($translate.instant("Remarks"))) { if(!modelItem.remark && $scope.isRequired($translate.instant("Remarks"))){
alertText += "【" + $translate.instant("Remarks") + "】" alertText += "【"+$translate.instant("Remarks")+"】"
} }
if (alertText.length > 0) { if(alertText.length > 0){
alertText = $translate.instant("Document") + (i + 1) + "," + alertText + $translate.instant("IsRequired"); alertText = $translate.instant("Document") + (i + 1) + "," + alertText + $translate.instant("IsRequired");
break; break;
} }
...@@ -1763,7 +1779,7 @@ taxDocumentManageModule.directive('helpPop', function () { ...@@ -1763,7 +1779,7 @@ taxDocumentManageModule.directive('helpPop', function () {
columns: [ columns: [
{ {
dataField: "fileAttr", dataField: "fileAttr",
caption: $translate.instant('DocumentAttr'), caption: $translate.instant('Document Attribute'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
var target = $('<span name="helpPopRadio" type="radio" ' + var target = $('<span name="helpPopRadio" type="radio" ' +
'data-id="helpPop_' + options.data.id + '" ' + 'data-id="helpPop_' + options.data.id + '" ' +
...@@ -1786,7 +1802,7 @@ taxDocumentManageModule.directive('helpPop', function () { ...@@ -1786,7 +1802,7 @@ taxDocumentManageModule.directive('helpPop', function () {
{ {
dataField: "fileType", dataField: "fileType",
caption: $translate.instant('DocumentType'), caption: $translate.instant('Document Type'),
}, },
{ {
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ ca1a6046
...@@ -373,16 +373,16 @@ ...@@ -373,16 +373,16 @@
} }
</style> </style>
<div class="menu-header TDL-header"> <div class="menu-header TDL-header">
<div class="TDL-query-bar" ng-init="MoreFields = false"> <div class="TDL-query-bar" ng-init="More = false">
<div data-id="1" class="TDL-query-row"> <div data-id="1" class="TDL-query-row">
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="DocumentAttr"></span> <span translate="Document Attribute"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<select ng-model="queryFieldModel.fileAttr" ng-change="queryFileAttr(queryFieldModel.fileAttr)" <select ng-model="queryFieldModel.fileAttr" ng-change="queryFileAttr(queryFieldModel.fileAttr)"
class="form-control radius3" class="form-control radius3"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileAttr in fileAttrOptions track by $index" <option ng-repeat="fileAttr in fileAttrOptions track by $index"
value="{{fileAttr}}">{{fileAttr}} value="{{fileAttr}}">{{fileAttr}}
...@@ -394,12 +394,12 @@ ...@@ -394,12 +394,12 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="DocumentType"></span> <span translate="Document Type"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<select ng-model="queryFieldModel.fileType" <select ng-model="queryFieldModel.fileType"
class="form-control radius3" class="form-control radius3"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileType in fileTypeOptions track by $index" value="{{fileType}}"> <option ng-repeat="fileType in fileTypeOptions track by $index" value="{{fileType}}">
{{fileType}} {{fileType}}
...@@ -411,11 +411,11 @@ ...@@ -411,11 +411,11 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="AvailabilityDate"></span> <span translate="Effective_Date"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.AvailabilityDate"/>--> <!--ng-model="queryFieldModel.Effective_Date"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker1"/>--> <!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)" <input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
...@@ -430,11 +430,11 @@ ...@@ -430,11 +430,11 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="Duration"></span> <span translate="Period"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.Duration"/>--> <!--ng-model="queryFieldModel.Period"/>-->
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)" <input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime" data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
...@@ -448,10 +448,10 @@ ...@@ -448,10 +448,10 @@
</div> </div>
</div> </div>
</div> </div>
<div data-id="2" ng-show="MoreFields" class="TDL-query-row"> <div data-id="2" ng-show="More" class="TDL-query-row">
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="DocumentName"></span> <span translate="Document Name"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<input type="text" class="form-control radius3" <input type="text" class="form-control radius3"
...@@ -460,12 +460,12 @@ ...@@ -460,12 +460,12 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="BusinessLine"></span> <span translate="Business Line"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<select ng-model="queryFieldModel.businessLine" <select ng-model="queryFieldModel.businessLine"
class="form-control radius3" class="form-control radius3"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="businessLine in businessLineOptions track by $index" value="{{businessLine.name}}"> <option ng-repeat="businessLine in businessLineOptions track by $index" value="{{businessLine.name}}">
{{businessLine.name}} {{businessLine.name}}
...@@ -477,15 +477,14 @@ ...@@ -477,15 +477,14 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="CorporationName"></span> <span translate="Company Name"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<div dx-select-box="queryOrgOptions" style="height: 33px;position: relative;top: 9px"></div> <div dx-select-box="queryOrgOptions" style="height: 33px;position: relative;top: 9px"></div>
<!--<select ng-model="queryFieldModel.companyName" class="form-control radius3"--> <!--<select ng-model="queryFieldModel.companyName" class="form-control radius3"-->
<!--title="{{queryFieldModel.companyName}}" required--> <!--title="{{queryFieldModel.companyName}}" required-->
<!--ng-change="matchCompanyId(queryFieldModel,companyNameOptionsMap)"--> <!--ng-change="matchCompanyId(queryFieldModel,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">--> <!--placeholder="{{'Please Select' | translate}}">-->
<!--<option value=""></option>--> <!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"--> <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-slected="queryFieldModel.companyName == companyName"--> <!--ng-slected="queryFieldModel.companyName == companyName"-->
...@@ -496,7 +495,7 @@ ...@@ -496,7 +495,7 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="DueDate"></span> <span translate="Due Date"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
...@@ -512,10 +511,10 @@ ...@@ -512,10 +511,10 @@
</div> </div>
</div> </div>
</div> </div>
<div data-id="3" ng-show="MoreFields" class="TDL-query-row"> <div data-id="3" ng-show="More" class="TDL-query-row">
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="TaxType"></span> <span translate="Tax Type"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
...@@ -533,7 +532,7 @@ ...@@ -533,7 +532,7 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="EntityIndex"></span> <span translate="Storage Index"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<input type="text" class="form-control radius3" <input type="text" class="form-control radius3"
...@@ -542,7 +541,7 @@ ...@@ -542,7 +541,7 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="EntityStorageLocation"></span> <span translate="Storage Location"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<input type="text" class="form-control radius3" <input type="text" class="form-control radius3"
...@@ -551,7 +550,7 @@ ...@@ -551,7 +550,7 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="EntityCustodian"></span> <span translate="Custodian"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<input type="text" class="form-control radius3" <input type="text" class="form-control radius3"
...@@ -559,10 +558,10 @@ ...@@ -559,10 +558,10 @@
</div> </div>
</div> </div>
</div> </div>
<div data-id="4" ng-show="MoreFields" class="TDL-query-row"> <div data-id="4" ng-show="More" class="TDL-query-row">
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="ApprovalStatus"></span> <span translate="Approval Status"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--auditSelectsMap--> <!--auditSelectsMap-->
...@@ -581,7 +580,7 @@ ...@@ -581,7 +580,7 @@
</div> </div>
<div class="TDL-query-block"> <div class="TDL-query-block">
<div class="TDL-query-des"> <div class="TDL-query-des">
<span translate="UploadDate"></span> <span translate="Upload Date"></span>
</div> </div>
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
...@@ -612,8 +611,8 @@ ...@@ -612,8 +611,8 @@
</div> </div>
<div data-id="5" class="TDL-query-row TDL-query-footer"> <div data-id="5" class="TDL-query-row TDL-query-footer">
<div class="TDL-query-more"> <div class="TDL-query-more">
<a href="javascript:void(0)" ng-click="MoreFields = !MoreFields"> <a href="javascript:void(0)" ng-click="More = !More">
<span>{{MoreFields ? 'LessFields' : 'MoreFields' | translate}}</span> <span>{{More ? 'Less' : 'More' | translate}}</span>
<i class=""></i> <i class=""></i>
</a> </a>
</div> </div>
...@@ -635,23 +634,23 @@ ...@@ -635,23 +634,23 @@
<div style="text-align: right;"> <div style="text-align: right;">
<button class="btn DTL-create-record" ng-click="openMultiUploadPop()"> <button class="btn DTL-create-record" ng-click="openMultiUploadPop()">
<i class="fa fa-tasks"></i> <i class="fa fa-tasks"></i>
<span translate="MultiUpload"></span> <span translate="Multiple File Upload"></span>
</button> </button>
<button class="btn DTL-create-record" ng-click="openSimpleUploadPop()"> <button class="btn DTL-create-record" ng-click="openSimpleUploadPop()">
<i class="fa fa-plus-square"></i> <i class="fa fa-plus-square"></i>
<span translate="CreateRecord"></span> <span translate="Create Record"></span>
</button> </button>
<button class="btn DTL-del-record"> <button class="btn DTL-del-record">
<i class="fa fa-trash-o"></i> <i class="fa fa-trash-o"></i>
<span translate="DelRecord" ng-click="delRecord()"></span> <span translate="Delete Record" ng-click="delRecord()"></span>
</button> </button>
<button class="btn"> <button class="btn">
<i class="fa fa-download"></i> <i class="fa fa-download"></i>
<span translate="DownloadAttachment" ng-click="downloadAttachment()"></span> <span translate="Download Attachment" ng-click="downloadAttachment()"></span>
</button> </button>
<button class="btn" ng-click="exportTableData()"> <button class="btn" ng-click="exportTableData()">
<i class="fa fa-file-excel-o"></i> <i class="fa fa-file-excel-o"></i>
<span translate="ExportTable"></span> <span translate="Export Record"></span>
</button> </button>
</div> </div>
</div> </div>
...@@ -674,7 +673,7 @@ ...@@ -674,7 +673,7 @@
<form class="form-horizontal" name="newDocFileTypeForm" <form class="form-horizontal" name="newDocFileTypeForm"
ng-submit="simpleUploadSubmit(editFieldModel,'simple')"> ng-submit="simpleUploadSubmit(editFieldModel,'simple')">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title"><span>{{isCreatePop ? 'UploadAttach' : 'Edit' | translate}}</span> <div class="modal-title"><span>{{isCreatePop ? 'Create Record' : 'Edit' | translate}}</span>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -682,11 +681,11 @@ ...@@ -682,11 +681,11 @@
<div ng-if="isCreatePop" class="col-sm-6 form-group"> <div ng-if="isCreatePop" class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentPath'|translate}} {{'Document Path'|translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" title="{{editFieldModel.fileNativePath}}" <input class="form-control" title="{{editFieldModel.fileNativePath}}"
placeholder="{{'PleaseSelected' | translate}}" placeholder="{{'Please Select' | translate}}"
readonly readonly
ng-model="editFieldModel.fileNativePath" ng-model="editFieldModel.fileNativePath"
required/> required/>
...@@ -709,11 +708,11 @@ ...@@ -709,11 +708,11 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentName' | translate}} {{'Document Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" title="{{editFieldModel.fileName}}" <input class="form-control" title="{{editFieldModel.fileName}}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldModel.fileName" ng-model="editFieldModel.fileName"
required/> required/>
</div> </div>
...@@ -721,13 +720,13 @@ ...@@ -721,13 +720,13 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentAttr' | translate}} {{'Document Attribute' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%" id="fileAttrOptions"> <div class="col-sm-11" style="width:61.67%" id="fileAttrOptions">
<select ng-model="editFieldModel.fileAttr" <select ng-model="editFieldModel.fileAttr"
ng-change="syncFileType(editFieldModel.fileAttr)" ng-change="syncFileType(editFieldModel.fileAttr)"
class="form-control" class="form-control"
required placeholder="{{'PleaseSelected' | translate}}"> required placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileAttr in fileAttrEnableOptions track by $index" <option ng-repeat="fileAttr in fileAttrEnableOptions track by $index"
ng-selected="(editFieldModel.fileAttr == fileAttr)" ng-selected="(editFieldModel.fileAttr == fileAttr)"
...@@ -745,15 +744,14 @@ ...@@ -745,15 +744,14 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'CorporationName' | translate}} {{'Company Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%;height: 13px" id="companyNameOptionsMap"> <div class="col-sm-11" style="width:61.67%" id="companyNameOptionsMap">
<div dx-select-box="editOrgOptions"></div> <div dx-select-box="editOrgOptions"></div>
<!--<select ng-model="editFieldModel.companyName" class="form-control"--> <!--<select ng-model="editFieldModel.companyName" class="form-control"-->
<!--title="{{editFieldModel.companyName}}" required--> <!--title="{{editFieldModel.companyName}}" required-->
<!--ng-change="matchCompanyId(editFieldModel,companyNameOptionsMap)"--> <!--ng-change="matchCompanyId(editFieldModel,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">--> <!--placeholder="{{'Please Select' | translate}}">-->
<!--<option value=""></option>--> <!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"--> <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-selected="(editFieldModel.companyName == companyName)"--> <!--ng-selected="(editFieldModel.companyName == companyName)"-->
...@@ -765,14 +763,14 @@ ...@@ -765,14 +763,14 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentType' | translate}} {{'Document Type' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldModel.fileType" <select ng-model="editFieldModel.fileType"
ng-disabled="curFileTypeOptions.length === 0" ng-disabled="curFileTypeOptions.length === 0"
class="form-control" class="form-control"
ng-change="syncRequiredFields(editFieldModel)" ng-change="syncRequiredFields(editFieldModel)"
required placeholder="{{'PleaseSelected' | translate}}"> required placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileType in curFileTypeOptions track by $index" <option ng-repeat="fileType in curFileTypeOptions track by $index"
ng-selected="(editFieldModel.fileType == fileType)" ng-selected="(editFieldModel.fileType == fileType)"
...@@ -783,19 +781,19 @@ ...@@ -783,19 +781,19 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('TaxType')"> * </span> <span class="required-tip" ng-if="isRequired('Tax Type')"> * </span>
{{'TaxType' | translate}} {{'Tax Type' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<!--<input class="form-control"--> <!--<input class="form-control"-->
<!--ng-required="isRequired('TaxType')"--> <!--ng-required="isRequired('TaxType')"-->
<!--placeholder="{{'PleaseSelected' | translate}}"--> <!--placeholder="{{'Please Select' | translate}}"-->
<!--ng-model="editFieldModel.taxType"--> <!--ng-model="editFieldModel.taxType"-->
<!--/>--> <!--/>-->
<select ng-model="editFieldModel.taxType" <select ng-model="editFieldModel.taxType"
class="form-control" class="form-control"
ng-required="isRequired('TaxType')" ng-required="isRequired('Tax Type')"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="taxType in taxTypeSelects track by $index" <option ng-repeat="taxType in taxTypeSelects track by $index"
ng-selected="(editFieldModel.taxType == taxType)" ng-selected="(editFieldModel.taxType == taxType)"
...@@ -807,10 +805,10 @@ ...@@ -807,10 +805,10 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'Duration' | translate}} {{'Period' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
data-date-format="yyyy/mm" data-date-format="yyyy/mm"
class="form-control" ng-model="editFieldModel.ownTime" required class="form-control" ng-model="editFieldModel.ownTime" required
data-min-view-mode="1"/> data-min-view-mode="1"/>
...@@ -818,37 +816,37 @@ ...@@ -818,37 +816,37 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span> <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
{{'AvailabilityDate' | translate}} {{'Effective_Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd" ng-change="changeFieldModel(1)" data-date-format="yyyy/mm/dd" ng-change="changeFieldModel(1)"
ng-required="isRequired('AvailabilityDate')" ng-required="isRequired('Effective_Date')"
class="form-control" ng-model="editFieldModel.fileTime"/> class="form-control" ng-model="editFieldModel.fileTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('DueDate')"> * </span> <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
{{'DueDate' | translate}} {{'Due Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd" data-date-format="yyyy/mm/dd"
ng-required="isRequired('DueDate')" ng-change="changeFieldModel(2)" ng-required="isRequired('Due Date')" ng-change="changeFieldModel(2)"
class="form-control" ng-model="editFieldModel.effectiveTime"/> class="form-control" ng-model="editFieldModel.effectiveTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
{{'EntityStorageLocation' | translate}} {{'Storage Location' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
placeholder="{{'PleaseType'|translate}}" placeholder="{{'Please Type'|translate}}"
ng-required="isRequired('EntityStorageLocation')" ng-required="isRequired('Storage Location')"
ng-model="editFieldModel.storageArea" ng-model="editFieldModel.storageArea"
/> />
</div> </div>
...@@ -861,27 +859,27 @@ ...@@ -861,27 +859,27 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span> <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
{{'EntityCustodian' | translate}} {{'Custodian' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-required="isRequired('EntityCustodian')" ng-required="isRequired('Custodian')"
ng-model="editFieldModel.keeper" ng-model="editFieldModel.keeper"
/> />
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
{{'EntityIndex' | translate}} {{'Storage Index' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
type="text" type="text"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-required="isRequired('EntityIndex')" ng-required="isRequired('Storage Index')"
ng-model="editFieldModel.physicalIndexNumber" ng-model="editFieldModel.physicalIndexNumber"
/> />
</div> </div>
...@@ -892,7 +890,7 @@ ...@@ -892,7 +890,7 @@
{{'Remarks' | translate}}</label></label> {{'Remarks' | translate}}</label></label>
<div class="col-sm-11" style="width:87.5%"> <div class="col-sm-11" style="width:87.5%">
<textarea class="form-control" <textarea class="form-control"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-required="isRequired('Remarks')" ng-required="isRequired('Remarks')"
ng-model="editFieldModel.remark"> ng-model="editFieldModel.remark">
</textarea> </textarea>
...@@ -903,7 +901,7 @@ ...@@ -903,7 +901,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary" translate="Confirm"></button> <button type="submit" class="btn btn-primary" translate="Confirm"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel4Tax"></button> translate="Cancel"></button>
</div> </div>
</form> </form>
</div> </div>
...@@ -937,11 +935,11 @@ ...@@ -937,11 +935,11 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentPath'|translate}} {{'Document Path'|translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" title="{{editFieldItem.fileNativePath}}" <input class="form-control" title="{{editFieldItem.fileNativePath}}"
placeholder="{{'PleaseSelected' | translate}}" placeholder="{{'Please Select' | translate}}"
ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}" ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"
ng-model="editFieldItem.fileNativePath"/> ng-model="editFieldItem.fileNativePath"/>
<!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">--> <!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">-->
...@@ -953,26 +951,26 @@ ...@@ -953,26 +951,26 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentName' | translate}} {{'Document Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
ng-class="{'upload-fail-mark':!editFieldItem.fileName && editFieldItem.fileName != 0}" ng-class="{'upload-fail-mark':!editFieldItem.fileName && editFieldItem.fileName != 0}"
title="{{editFieldItem.fileName}}" title="{{editFieldItem.fileName}}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.fileName"/> ng-model="editFieldItem.fileName"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentAttr' | translate}} {{'Document Attribute' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.fileAttr" <select ng-model="editFieldItem.fileAttr"
ng-class="{'upload-fail-mark':!editFieldItem.fileAttr}" ng-class="{'upload-fail-mark':!editFieldItem.fileAttr}"
ng-change="syncFileType(editFieldItem.fileAttr)" ng-change="syncFileType(editFieldItem.fileAttr)"
class="form-control" placeholder="{{'PleaseSelected' | translate}}"> class="form-control" placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileAttr in fileAttrOptions track by $index" <option ng-repeat="fileAttr in fileAttrOptions track by $index"
ng-selected="(editFieldItem.fileAttr == fileAttr)" ng-selected="(editFieldItem.fileAttr == fileAttr)"
...@@ -989,16 +987,15 @@ ...@@ -989,16 +987,15 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'CorporationName' | translate}} {{'Company Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%;height: 13px"> <div class="col-sm-11" style="width:61.67%">
<div ng-class="{'upload-fail-mark':!editFieldItem.companyName}" dx-select-box="editFieldItemOrgOptions"></div> <div ng-class="{'upload-fail-mark':!editFieldItem.companyName}" dx-select-box="editFieldItemOrgOptions"></div>
<!--<select ng-model="editFieldItem.companyName" class="form-control"--> <!--<select ng-model="editFieldItem.companyName" class="form-control"-->
<!--title="{{editFieldItem.companyName}}"--> <!--title="{{editFieldItem.companyName}}"-->
<!--ng-class="{'upload-fail-mark':!editFieldItem.companyName}"--> <!--ng-class="{'upload-fail-mark':!editFieldItem.companyName}"-->
<!--ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"--> <!--ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">--> <!--placeholder="{{'Please Select' | translate}}">-->
<!--<option value=""></option>--> <!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"--> <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-selected="(editFieldItem.companyName == companyName)"--> <!--ng-selected="(editFieldItem.companyName == companyName)"-->
...@@ -1010,7 +1007,7 @@ ...@@ -1010,7 +1007,7 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentType' | translate}} {{'Document Type' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.fileType" <select ng-model="editFieldItem.fileType"
...@@ -1018,7 +1015,7 @@ ...@@ -1018,7 +1015,7 @@
ng-change="syncRequiredFields(editFieldItem)" ng-change="syncRequiredFields(editFieldItem)"
class="form-control" class="form-control"
ng-class="{'upload-fail-mark':!editFieldItem.fileType}" ng-class="{'upload-fail-mark':!editFieldItem.fileType}"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="fileType in curFileTypeOptions track by $index" <option ng-repeat="fileType in curFileTypeOptions track by $index"
ng-selected="(editFieldItem.fileType == fileType)" ng-selected="(editFieldItem.fileType == fileType)"
...@@ -1029,15 +1026,15 @@ ...@@ -1029,15 +1026,15 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('TaxType')"> * </span> <span class="required-tip" ng-if="isRequired('Tax Type')"> * </span>
{{'TaxType' | translate}} {{'Tax Type' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.taxType" <select ng-model="editFieldItem.taxType"
class="form-control" class="form-control"
ng-required="isRequired('TaxType')" ng-required="isRequired('Tax Type')"
ng-class="{'upload-fail-mark':isRequired('TaxType') && !editFieldItem.taxType}" ng-class="{'upload-fail-mark':isRequired('Tax Type') && !editFieldItem.taxType}"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option value=""></option> <option value=""></option>
<option ng-repeat="taxType in taxTypeSelects track by $index" <option ng-repeat="taxType in taxTypeSelects track by $index"
ng-selected="(editFieldItem.taxType == taxType)" ng-selected="(editFieldItem.taxType == taxType)"
...@@ -1049,10 +1046,10 @@ ...@@ -1049,10 +1046,10 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'Duration' | translate}} {{'Period' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'Please Select' | translate}}"
date-time-picker data-date-format="yyyy/mm" date-time-picker data-date-format="yyyy/mm"
ng-class="{'upload-fail-mark':!editFieldItem.ownTime}" ng-class="{'upload-fail-mark':!editFieldItem.ownTime}"
class="form-control" ng-model="editFieldItem.ownTime" class="form-control" ng-model="editFieldItem.ownTime"
...@@ -1061,37 +1058,37 @@ ...@@ -1061,37 +1058,37 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span> <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
{{'AvailabilityDate' | translate}} {{'Effective_Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(1)" <input type='text' placeholder="{{'Please Select' | translate}}" ng-change="changeFieldItem(1)"
ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}" ng-class="{'upload-fail-mark':isRequired('Effective_Date') && !editFieldItem.fileTime}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.fileTime"/> class="form-control" ng-model="editFieldItem.fileTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('DueDate')"> * </span> <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
{{'DueDate' | translate}} {{'Due Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(2)" <input type='text' placeholder="{{'Please Select' | translate}}" ng-change="changeFieldItem(2)"
ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}" ng-class="{'upload-fail-mark':isRequired('Due Date') && !editFieldItem.effectiveTime}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.effectiveTime"/> class="form-control" ng-model="editFieldItem.effectiveTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
{{'EntityStorageLocation' | translate}} {{'Storage Location' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
ng-class="{'upload-fail-mark':isRequired('EntityStorageLocation') && !editFieldItem.storageArea}" ng-class="{'upload-fail-mark':isRequired('Storage Location') && !editFieldItem.storageArea}"
placeholder="{{'PleaseSelected'|translate}}" placeholder="{{'Please Select'|translate}}"
ng-model="editFieldItem.storageArea" ng-model="editFieldItem.storageArea"
/> />
</div> </div>
...@@ -1106,27 +1103,27 @@ ...@@ -1106,27 +1103,27 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span> <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
{{'EntityCustodian' | translate}} {{'Custodian' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
ng-class="{'upload-fail-mark':isRequired('EntityCustodian') && !editFieldItem.keeper}" ng-class="{'upload-fail-mark':isRequired('Custodian') && !editFieldItem.keeper}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.keeper" ng-model="editFieldItem.keeper"
/> />
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
{{'EntityIndex' | translate}} {{'Storage Index' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
type="text" type="text"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-class="{'upload-fail-mark':isRequired('EntityIndex') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}" ng-class="{'upload-fail-mark':isRequired('Storage Index') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}"
ng-model="editFieldItem.physicalIndexNumber" ng-model="editFieldItem.physicalIndexNumber"
readonly readonly
/> />
...@@ -1140,7 +1137,7 @@ ...@@ -1140,7 +1137,7 @@
<div class="col-sm-11" style="width:87.5%"> <div class="col-sm-11" style="width:87.5%">
<textarea class="form-control" <textarea class="form-control"
ng-class="{'upload-fail-mark':isRequired('Remarks') && !editFieldItem.remark && editFieldItem.remark != 0}" ng-class="{'upload-fail-mark':isRequired('Remarks') && !editFieldItem.remark && editFieldItem.remark != 0}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.remark"> ng-model="editFieldItem.remark">
</textarea> </textarea>
</div> </div>
...@@ -1154,7 +1151,7 @@ ...@@ -1154,7 +1151,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit_handmade()"></button> <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit_handmade()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()" <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()"
translate="Cancel4Tax"></button> translate="Cancel"></button>
</div> </div>
</form> </form>
</div> </div>
...@@ -1187,11 +1184,11 @@ ...@@ -1187,11 +1184,11 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentPath'|translate}} {{'Document Path'|translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" title="{{editFieldItem.fileNativePath}}" <input class="form-control" title="{{editFieldItem.fileNativePath}}"
placeholder="{{'PleaseSelected' | translate}}" placeholder="{{'Please Select' | translate}}"
readonly required readonly required
ng-model="editFieldItem.fileNativePath"/> ng-model="editFieldItem.fileNativePath"/>
&lt;!&ndash;<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">&ndash;&gt; &lt;!&ndash;<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">&ndash;&gt;
...@@ -1209,11 +1206,11 @@ ...@@ -1209,11 +1206,11 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentName' | translate}} {{'Document Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" title="{{editFieldItem.fileName}}" <input class="form-control" title="{{editFieldItem.fileName}}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.fileName" ng-model="editFieldItem.fileName"
required/> required/>
</div> </div>
...@@ -1221,13 +1218,13 @@ ...@@ -1221,13 +1218,13 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentAttr' | translate}} {{'Document Attribute' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.fileAttr" <select ng-model="editFieldItem.fileAttr"
ng-change="syncFileType(editFieldItem.fileAttr)" ng-change="syncFileType(editFieldItem.fileAttr)"
class="form-control" class="form-control"
required placeholder="{{'PleaseSelected' | translate}}"> required placeholder="{{'Please Select' | translate}}">
<option ng-repeat="fileAttr in fileAttrOptions track by $index" <option ng-repeat="fileAttr in fileAttrOptions track by $index"
ng-selected="(editFieldItem.fileAttr == fileAttr)" ng-selected="(editFieldItem.fileAttr == fileAttr)"
value="{{fileAttr}}">{{fileAttr}} value="{{fileAttr}}">{{fileAttr}}
...@@ -1243,13 +1240,13 @@ ...@@ -1243,13 +1240,13 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'CorporationName' | translate}} {{'Company Name' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.companyName" class="form-control" <select ng-model="editFieldItem.companyName" class="form-control"
title="{{editFieldItem.companyName}}" required title="{{editFieldItem.companyName}}" required
ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)" ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option ng-repeat="(key,companyName) in companyNameOptionsMap" <option ng-repeat="(key,companyName) in companyNameOptionsMap"
ng-selected="(editFieldItem.companyName == companyName)" ng-selected="(editFieldItem.companyName == companyName)"
...@@ -1261,14 +1258,14 @@ ...@@ -1261,14 +1258,14 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'DocumentType' | translate}} {{'Document Type' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.fileType" <select ng-model="editFieldItem.fileType"
ng-disabled="curFileTypeOptions.length === 0" ng-disabled="curFileTypeOptions.length === 0"
ng-change="syncRequiredFields(editFieldItem)" ng-change="syncRequiredFields(editFieldItem)"
class="form-control" required class="form-control" required
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option ng-repeat="fileType in curFileTypeOptions track by $index" <option ng-repeat="fileType in curFileTypeOptions track by $index"
ng-selected="(editFieldItem.fileType == fileType)" ng-selected="(editFieldItem.fileType == fileType)"
value="{{fileType}}">{{fileType}} value="{{fileType}}">{{fileType}}
...@@ -1285,7 +1282,7 @@ ...@@ -1285,7 +1282,7 @@
<select ng-model="editFieldItem.taxType" <select ng-model="editFieldItem.taxType"
class="form-control" class="form-control"
ng-required="isRequired('TaxType')" ng-required="isRequired('TaxType')"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'Please Select' | translate}}">
<option ng-repeat="taxType in taxTypeSelects track by $index" <option ng-repeat="taxType in taxTypeSelects track by $index"
ng-selected="(editFieldItem.taxType == taxType)" ng-selected="(editFieldItem.taxType == taxType)"
value="{{taxType}}">{{taxType}} value="{{taxType}}">{{taxType}}
...@@ -1296,10 +1293,10 @@ ...@@ -1296,10 +1293,10 @@
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span> <span class="required-tip"> * </span>
{{'Duration' | translate}} {{'Period' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'Please Select' | translate}}"
date-time-picker data-date-format="yyyy/mm" date-time-picker data-date-format="yyyy/mm"
class="form-control" ng-model="editFieldItem.ownTime" required class="form-control" ng-model="editFieldItem.ownTime" required
data-min-view-mode="1"/> data-min-view-mode="1"/>
...@@ -1307,38 +1304,38 @@ ...@@ -1307,38 +1304,38 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span> <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
{{'AvailabilityDate' | translate}} {{'Effective_Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'Please Select' | translate}}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
ng-required="isRequired('AvailabilityDate')" ng-required="isRequired('Effective_Date')"
class="form-control" ng-model="editFieldItem.fileTime"/> class="form-control" ng-model="editFieldItem.fileTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('DueDate')"> * </span> <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
{{'DueDate' | translate}} {{'Due Date' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'Please Select' | translate}}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
ng-required="isRequired('DueDate')" ng-required="isRequired('Due Date')"
class="form-control" ng-model="editFieldItem.effectiveTime"/> class="form-control" ng-model="editFieldItem.effectiveTime"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
{{'EntityStorageLocation' | translate}} {{'Storage Location' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
placeholder="{{'PleaseSelected'|translate}}" placeholder="{{'Please Select'|translate}}"
ng-model="editFieldItem.storageArea" ng-model="editFieldItem.storageArea"
ng-required="isRequired('EntityStorageLocation')" ng-required="isRequired('Storage Location')"
/> />
</div> </div>
<div class="DTL-special-external-btn" <div class="DTL-special-external-btn"
...@@ -1352,28 +1349,28 @@ ...@@ -1352,28 +1349,28 @@
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span> <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
{{'EntityCustodian' | translate}} {{'Custodian' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
ng-required="isRequired('EntityCustodian')" ng-required="isRequired('Custodian')"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.keeper" ng-model="editFieldItem.keeper"
/> />
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span> <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
{{'EntityIndex' | translate}} {{'Storage Index' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input class="form-control" <input class="form-control"
type="text" type="text"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-model="editFieldItem.physicalIndexNumber" ng-model="editFieldItem.physicalIndexNumber"
ng-required="isRequired('EntityIndex')" ng-required="isRequired('Storage Index')"
/> />
</div> </div>
</div> </div>
...@@ -1384,7 +1381,7 @@ ...@@ -1384,7 +1381,7 @@
</label> </label>
<div class="col-sm-11" style="width:87.5%"> <div class="col-sm-11" style="width:87.5%">
<textarea class="form-control" <textarea class="form-control"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'Please Type' | translate}}"
ng-required="isRequired('Remarks')" ng-required="isRequired('Remarks')"
ng-model="editFieldItem.remark"> ng-model="editFieldItem.remark">
</textarea> </textarea>
...@@ -1399,20 +1396,42 @@ ...@@ -1399,20 +1396,42 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit()"></button> <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel4Tax"></button> translate="Cancel"></button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div>--> </div>-->
<div class="TDL-pdf-layout-dialog" id="filePreviewPop" file-preview > <div class="TDL-pdf-layout-dialog" id="filePreviewPop" file-preview >
<div class="wrapper TDL-pdf-preview-pop" id="excetlContainer"> <div class="wrapper TDL-pdf-preview-pop" id="excetlContainer">
</div> </div>
<button class="TDL-pdf-preview-pop-close-btn" ng-click="hideFilePreviewPop()">×</button> <button class="TDL-pdf-preview-pop-close-btn" ng-click="hideFilePreviewPop()">×</button>
</div> </div>
<!---->
<!--<div class="modal fade" id="filePreviewPop" file-preview tabindex="-1" role="dialog" aria-labelledby="myModal"-->
<!--data-backdrop="static" data-keyboard="false">-->
<!--<div class="modal-dialog" style="width:80%;" role="document">-->
<!--<div class="modal-content">-->
<!--<div class="modal-header">-->
<!--<span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideFilePreviewPop()">×</span>-->
<!--<div class="modal-title">{{currentSheetName}}</div>-->
<!--</div>-->
<!--<div class="modal-body">-->
<!--<div class="dx-viewport demo-container" id="preview_dataGrid">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging_xls()" title="上一页">&lt;-->
<!--</button>-->
<!--<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging_xls()" title="下一页">&gt;-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<div class="modal fade" id="uploadResultPop" tabindex="-1" role="dialog" aria-labelledby="myModal" <div class="modal fade" id="uploadResultPop" tabindex="-1" role="dialog" aria-labelledby="myModal"
data-backdrop="static" data-keyboard="false"> data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width:60%;max-width:960px" role="document"> <div class="modal-dialog" style="width:60%;max-width:960px" role="document">
...@@ -1437,7 +1456,7 @@ ...@@ -1437,7 +1456,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button> <button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button>
<button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel4Tax"></button> <button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel"></button>
</div> </div>
</div> </div>
</div> </div>
...@@ -1458,7 +1477,7 @@ ...@@ -1458,7 +1477,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="sniffHelpPopRadio()"></button> <button type="button" class="btn btn-primary" translate="Confirm" ng-click="sniffHelpPopRadio()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel4Tax"></button> translate="Cancel"></button>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment