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

Merge branch 'dev_test' into dev_20230829_change

Browse Source 
# Conflicts:
#	src/components/hzwlComponents/ReceiptDescription.vue
#	src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
This commit is contained in:
wxyclub
2023-11-28 15:34:45 +08:00
parent 423b5198ea 5d3b76140b
commit f49c92a941
312 changed files with 8247 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+28 -1
View File
@@ -315,6 +315,15 @@
min-width="5%"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + ((tableFlag === '' ? sarBussionessSearch.page : tableFlag.page) - 1) * (tableFlag === '' ? sarBussionessSearch.pageSize : tableFlag.pageSize) }}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- show-overflow-tooltip-->
@@ -922,7 +931,7 @@
</div>
</el-drawer>
<!-- 导入模态窗 -->
<el-dialog width='400px' :visible.sync="importModalshowflag" title="导入文件">
<el-dialog width='400px' :visible.sync="importModalshowflag" title="导入文件" v-dragDialogWidth :close-on-click-modal="false">
<el-upload
multiple
drag
@@ -1009,6 +1018,15 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (configPage - 1) * configRows }}
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standCode"
@@ -1546,6 +1564,15 @@
:height="300"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (replacePage - 1) * replaceLawsNumForm.pageSize }}
</template>
</el-table-column>
<el-table-column
label="企标编号">
<template slot-scope="scope">