Commit 74e909e1 authored by chase's avatar chase

fix bug

parent 2167aa96
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
</div> </div>
<div class="DTL-special-external-btn" title="查看类型列表"> <div class="DTL-special-external-btn" title="查看类型列表">
<a href="javascript:void(0)" ng-click="openHelpPop()"> <a href="javascript:void(0)" ng-click="openHelpPop(editFieldModel)">
<i class="fa fake-question-circle" aria-hidden="true"></i> <i class="fa fake-question-circle" aria-hidden="true"></i>
</a> </a>
</div> </div>
...@@ -913,7 +913,6 @@ ...@@ -913,7 +913,6 @@
<input class="form-control" title="{{editFieldItem.fileNativePath}}" <input class="form-control" title="{{editFieldItem.fileNativePath}}"
placeholder="{{'PleaseSelected' | translate}}" placeholder="{{'PleaseSelected' | translate}}"
ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}" ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"
readonly disabled
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">-->
</div> </div>
...@@ -930,8 +929,8 @@ ...@@ -930,8 +929,8 @@
<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}}" disabled placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.fileName" readonly/> ng-model="editFieldItem.fileName"/>
</div> </div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
...@@ -942,8 +941,8 @@ ...@@ -942,8 +941,8 @@
<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)" disabled ng-change="syncFileType(editFieldItem.fileAttr)"
class="form-control" readonly placeholder="{{'PleaseSelected' | translate}}"> class="form-control" placeholder="{{'PleaseSelected' | 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}}
...@@ -951,10 +950,10 @@ ...@@ -951,10 +950,10 @@
</select> </select>
</div> </div>
<!--<div class="DTL-special-external-btn" title="查看类型列表"> <div class="DTL-special-external-btn" title="查看类型列表">
<a href="javascript:void(0)" ng-click="openHelpPop()"><i <a href="javascript:void(0)" ng-click="openHelpPop(editFieldItem)"><i
class="fa fake-question-circle" aria-hidden="true"></i></a> class="fa fake-question-circle" aria-hidden="true"></i></a>
</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">
...@@ -963,7 +962,7 @@ ...@@ -963,7 +962,7 @@
</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}}" readonly disabled 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="{{'PleaseSelected' | translate}}">
...@@ -982,8 +981,9 @@ ...@@ -982,8 +981,9 @@
</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-change="syncRequiredFields(editFieldItem)" ng-change="syncRequiredFields(editFieldItem)"
class="form-control" readonly disabled class="form-control"
ng-class="{'upload-fail-mark':!editFieldItem.fileType}" ng-class="{'upload-fail-mark':!editFieldItem.fileType}"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'PleaseSelected' | translate}}">
<option ng-repeat="fileType in curFileTypeOptions track by $index" <option ng-repeat="fileType in curFileTypeOptions track by $index"
...@@ -1000,7 +1000,7 @@ ...@@ -1000,7 +1000,7 @@
</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" readonly disabled class="form-control"
ng-required="isRequired('TaxType')" ng-required="isRequired('TaxType')"
ng-class="{'upload-fail-mark':isRequired('TaxType') && !editFieldItem.taxType}" ng-class="{'upload-fail-mark':isRequired('TaxType') && !editFieldItem.taxType}"
placeholder="{{'PleaseSelected' | translate}}"> placeholder="{{'PleaseSelected' | translate}}">
...@@ -1020,7 +1020,7 @@ ...@@ -1020,7 +1020,7 @@
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'PleaseSelected' | 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" readonly disabled class="form-control" ng-model="editFieldItem.ownTime"
data-min-view-mode="1"/> data-min-view-mode="1"/>
</div> </div>
</div> </div>
...@@ -1032,7 +1032,7 @@ ...@@ -1032,7 +1032,7 @@
<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="{{'PleaseSelected' | translate}}"
ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}" ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
date-time-picker data-date-format="yyyy/mm/dd" readonly disabled 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>
...@@ -1044,7 +1044,7 @@ ...@@ -1044,7 +1044,7 @@
<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="{{'PleaseSelected' | translate}}"
ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}" ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
date-time-picker data-date-format="yyyy/mm/dd" readonly disabled 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>
...@@ -1057,7 +1057,7 @@ ...@@ -1057,7 +1057,7 @@
<input class="form-control" <input class="form-control"
ng-class="{'upload-fail-mark':isRequired('EntityStorageLocation') && !editFieldItem.storageArea}" ng-class="{'upload-fail-mark':isRequired('EntityStorageLocation') && !editFieldItem.storageArea}"
placeholder="{{'PleaseSelected'|translate}}" placeholder="{{'PleaseSelected'|translate}}"
ng-model="editFieldItem.storageArea" readonly disabled ng-model="editFieldItem.storageArea"
/> />
</div> </div>
<div class="DTL-special-external-btn" <div class="DTL-special-external-btn"
...@@ -1075,7 +1075,7 @@ ...@@ -1075,7 +1075,7 @@
{{'EntityCustodian' | translate}} {{'EntityCustodian' | 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" readonly disabled <input class="form-control"
ng-class="{'upload-fail-mark':isRequired('EntityCustodian') && !editFieldItem.keeper}" ng-class="{'upload-fail-mark':isRequired('EntityCustodian') && !editFieldItem.keeper}"
placeholder="{{'PleaseType' | translate}}" placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.keeper" ng-model="editFieldItem.keeper"
...@@ -1093,7 +1093,7 @@ ...@@ -1093,7 +1093,7 @@
placeholder="{{'PleaseType' | translate}}" placeholder="{{'PleaseType' | translate}}"
ng-class="{'upload-fail-mark':isRequired('EntityIndex') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}" ng-class="{'upload-fail-mark':isRequired('EntityIndex') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}"
ng-model="editFieldItem.physicalIndexNumber" ng-model="editFieldItem.physicalIndexNumber"
readonly disabled readonly
/> />
</div> </div>
</div> </div>
...@@ -1106,7 +1106,6 @@ ...@@ -1106,7 +1106,6 @@
<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="{{'PleaseType' | translate}}"
readonly disabled
ng-model="editFieldItem.remark"> ng-model="editFieldItem.remark">
</textarea> </textarea>
</div> </div>
...@@ -1118,9 +1117,9 @@ ...@@ -1118,9 +1117,9 @@
<div style="clear:both"></div> <div style="clear:both"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="closeUploadReview()"></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="cancelDocFileType()"--> <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()"
<!--translate="Cancel"></button>--> translate="Cancel"></button>
</div> </div>
</form> </form>
</div> </div>
...@@ -1399,12 +1398,12 @@ ...@@ -1399,12 +1398,12 @@
<div class="modal-dialog" style="width:60%;max-width:960px" role="document"> <div class="modal-dialog" style="width:60%;max-width:960px" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title">提示讯息</div> <div class="modal-title" translate="Tips"></div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p ng-if="multiUploadSuccessItems.length">{{multiUploadSuccessItems.length}}{{'UploadSuccessCount'|translate}}</p> <p ng-if="uploadResultSuccessList.length">{{uploadResultSuccessList.length}}{{'UploadSuccessCount'|translate}}</p>
<ul> <ul>
<li ng-repeat="item in multiUploadSuccessItems"> <li ng-repeat="item in uploadResultSuccessList">
<span>{{item.fileName}}</span> <span>{{item.fileName}}</span>
</li> </li>
</ul> </ul>
......
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