Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -1389,7 +1389,9 @@
|
||||
<div class="see-drawer-div">
|
||||
<label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
|
||||
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
|
||||
{{ standShowItemEO.complianceRequire }}</span>
|
||||
{{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="see-drawer-div">
|
||||
|
||||
@@ -1534,7 +1534,7 @@ export default {
|
||||
this.rowList = row;
|
||||
this.editRowData = this.rowList;
|
||||
if(this.editRowData.syrz === '-'){
|
||||
this.editRowData.ssrq = "";
|
||||
this.editRowData.syrz = "";
|
||||
}else if(this.editRowData.syrz){
|
||||
this.editRowData.syrz = this.editRowData.syrz.split(',')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user