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-04-27 13:19:40 +08:00
parent a88548e75c ec7a0d383a
commit 46a81f5e20
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -1301,7 +1301,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1 -1
View File
@@ -492,7 +492,7 @@
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/> <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer" style="position: absolute;bottom: 0px">
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"