Merge branch 'dev_test' into dev_20230829_change

# Conflicts: # 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
2023-11-30 18:04:28 +08:00
parent ecb9cef4a8 a5e3fd56a7
commit 21c1b6b161
199 changed files with 4345 additions and 7023 deletions
@@ -321,7 +321,7 @@
              label="序号"
              align="center">
            <template slot-scope="{scope, column, $index}">
-              {{ ($index + 1) + ((tableFlag === '' ? sarBussionessSearch.page : tableFlag.page) - 1) * (tableFlag === '' ? sarBussionessSearch.pageSize : tableFlag.pageSize) }}
+              {{ ($index + 1) + ((tableFlag === '' ? sarBussionessSearch.page : tableFlag.page) - 1) * (tableFlag === '' ? sarBussionessSearch.pageSize : $store.getters.userInfo.configContent) }}
            </template>
          </el-table-column>