FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-05-17 10:48:47 +08:00
parent 5a0180e9dd 1eaac03101
commit cfd33c4984
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+3 -1
View File
@@ -1389,7 +1389,9 @@
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label> <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire"> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
{{ standShowItemEO.complianceRequire }}</span> {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1 -1
View File
@@ -1534,7 +1534,7 @@ export default {
this.rowList = row; this.rowList = row;
this.editRowData = this.rowList; this.editRowData = this.rowList;
if(this.editRowData.syrz === '-'){ if(this.editRowData.syrz === '-'){
this.editRowData.ssrq = ""; this.editRowData.syrz = "";
}else if(this.editRowData.syrz){ }else if(this.editRowData.syrz){
this.editRowData.syrz = this.editRowData.syrz.split(',') this.editRowData.syrz = this.editRowData.syrz.split(',')
} }