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

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

Browse Source 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
#	src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
#	src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
This commit is contained in:
zyn
2023-11-30 17:56:31 +08:00
parent ea4a95e93f 933c32418c
commit a5e3fd56a7
20 changed files with 153 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+6 -6
View File
@@ -3,14 +3,14 @@
<div id="mechanism" >
<div class="mechanism-content">
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%">
<el-tab-pane label="机构管理" name="mechanism">
<mechanism></mechanism>
<el-tab-pane label="机构管理" name="mechanism" >
<mechanism v-if="activeName=='mechanism'"></mechanism>
</el-tab-pane>
<el-tab-pane label="工作组" name="workgroup">
<workgroup></workgroup>
<el-tab-pane label="工作组" name="workgroup" >
<workgroup v-if="activeName=='workgroup'"></workgroup>
</el-tab-pane>
<el-tab-pane label="技术委员会" name="committee">
<committee></committee>
<el-tab-pane label="技术委员会" name="committee" >
<committee v-if="activeName=='committee'"></committee>
</el-tab-pane>
</el-tabs>
</div>
src/pages/localTool/standAutoSplit/index.vue
+5 -2
View File
@@ -260,6 +260,8 @@
</el-table>
<pagination
style="position: static;"
:auto-size="true"
:pageSize="addFilePageSize"
:total="addFileStandtotal"
:page="addFilePage"
@pageChange="addFileStandPageChange"
@@ -655,6 +657,7 @@
</el-table-column>
</el-table>
<pagination
:auto-size="true"
:page="conditionForm.page"
:pageSize="conditionForm.pageSize"
:total="total2"
@@ -780,7 +783,7 @@ export default {
saveFileName: '',
selectedSplitStandList: [],
addFilePage: 1,
addFilePageSize: this.$store.getters.userInfo.configContent,
addFilePageSize: 20,
splitInfoPage: 1,
splitInfoPageSize: this.$store.getters.userInfo.configContent,
selectedList: [],
@@ -831,7 +834,7 @@ export default {
standType: 'INLAND',
numberName: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
pageSize: 20
},
tableData: [],
total2: 0,
src/pages/localTool/standContrast/pages/contrastDetails.vue
+14 -3
View File
@@ -241,8 +241,20 @@ export default {
},
props: {
},
watch: {
watch:{
addFilePageSize(){
if( this.addFilePageSize1 != this.$store.getters.userInfo.configContent)
this.addFilePageSize2 = this.$store.getters.userInfo.configContent
this.getSarFileSplitInfoEOPage()
},
addFilePageSize2(){
if( this.addFilePageSize != this.$store.getters.userInfo.configContent)
this.addFilePageSize =this.$store.getters.userInfo.configContent
this.getSarFileSplitInfoEOPage2()
}
},
methods: {
// select (selection, row) {
// this.$refs.standSelectTable.clearSelection()
@@ -461,8 +473,7 @@ export default {
this.getSarFileSplitInfoEOPage2()
}
},
computed: {
},
mounted () {
this.getSarFileSplitInfoEOPage()
this.getSarFileSplitInfoEOPage2()
src/pages/localTool/standardRecognition/index.vue
+7 -5
View File
@@ -36,7 +36,7 @@
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (handleSelectForm.page - 1) * handleSelectForm.pageSize }}
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
@@ -126,8 +126,8 @@
<loading :loading="loading">正在获取中……</loading>
<pagination
:total="total"
:pageChange="page"
:pageSizeChange="pageSize"
:page="page"
:pageSize="pageSize"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
></pagination>
@@ -707,7 +707,9 @@
<pagination
v-show="this.lawInfoTableLoading === false"
style="position: relative;"
:auto-size="true"
:page="handleSelectForm.page"
:page-size="handleSelectForm.pageSize"
:total="handleSelectForm.total"
@pageChange="handleSelectPageChange"
@pageSizeChange="handleSelectPageSizeChange"></pagination>
@@ -749,7 +751,7 @@ export default {
lawNumber: '', // 标准编号/政策编号
lawName: '', // 标准名称/政策名称
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: '',
quoteIdList: '',
@@ -1356,7 +1358,7 @@ export default {
changeData() {},
// 分页点击后方法
pageChange(page) {
this.handleSelectForm.page = page;
this.page = page;
this.getTableData();
},
// 分页每页显示数改变后方法
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+6
View File
@@ -198,6 +198,12 @@
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+6
View File
@@ -216,6 +216,12 @@
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+12
View File
@@ -74,6 +74,12 @@
fontWeight: 'bold', height: '48px'}"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
@@ -213,6 +219,12 @@
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+3
View File
@@ -3100,6 +3100,9 @@
this.replaceLawsNumForm = {
standName: '',
standNumber: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
}
this.replaceLawsNumModel = true
this.replaceLawType = ''
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+12
View File
@@ -1512,6 +1512,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) + (replacePage - 1) * replaceLawsNumForm.pageSize }}
</template>
</el-table-column>
<el-table-column
label="标准编号">
<template slot-scope="scope">
@@ -2225,6 +2234,9 @@ export default {
this.replaceLawsNumForm = {
standName: '',
standNumber: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
}
this.replaceLawsNumModel = true
this.replaceLawType = ''
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+12
View File
@@ -50,6 +50,12 @@
@selection-change="selectStandChange">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="标准号" width="180" prop="standNumber">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@@ -117,6 +123,12 @@
tooltip-effect="dark">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column align="center" label="任务步骤" prop="name">
</el-table-column>
<el-table-column align="center" label="任务受理人" prop="assignee">
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+14
View File
@@ -73,6 +73,14 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
fixed="left"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
@@ -325,6 +333,12 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+13
View File
@@ -65,6 +65,13 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
fixed="left"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
@@ -221,6 +228,12 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue
+12
View File
@@ -65,6 +65,12 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
@@ -217,6 +223,12 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+13
View File
@@ -65,6 +65,13 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
fixed="left"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
@@ -221,6 +228,12 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -4
View File
@@ -221,7 +221,7 @@
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + ((tableFlag === '' ? sarStandardsSearch.page : tableFlag.page)-1) * (tableFlag === '' ? sarStandardsSearch.pageSize : tableFlag.pageSize)}}
{{ ($index + 1) + ((tableFlag === '' ? sarStandardsSearch.page : tableFlag.page)-1) * (tableFlag === '' ? sarStandardsSearch.pageSize : $store.getters.userInfo.configContent)}}
</template>
</el-table-column>
<el-table-column
@@ -2432,13 +2432,13 @@ export default {
rows: 10,
replacePage: 1,
replaceTotal: 0,
replaceRows: 10,
replaceRows: this.$store.getters.userInfo.configContent,
pageItems: 1,
totalItems: 0,
itemsRows: 10,
itemsRows: this.$store.getters.userInfo.configContent,
configPage: 1,
configTotal: 0,
configRows: 10,
configRows: this.$store.getters.userInfo.configContent,
zNodesS: [], // 责任部门树结构
zNodesSItem: [],
searchInlandNodes: [], // 条目部门选择树形结构
@@ -3924,6 +3924,7 @@ export default {
// 搜索
getDomesticStandardTableBtn(item) {
sessionStorage.setItem('tableFlag', JSON.stringify(item))
this.tableFlag = item
item.page = 1
this.getDomesticStandardTable(item)
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -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>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+3 -3
View File
@@ -2070,13 +2070,13 @@ export default {
rows: 10,
replacePage: 1,
replaceTotal: 0,
replaceRows: 10,
replaceRows: this.$store.getters.userInfo.configContent,
pageItems: 1,
totalItems: 0,
itemsRows: 10,
itemsRows: this.$store.getters.userInfo.configContent,
configPage: 1,
configTotal: 0,
configRows: 10,
configRows: this.$store.getters.userInfo.configContent,
zNodesS: [], // 责任部门树结构
zNodesSItem: [],
searchInlandNodes: [], // 条目部门选择树形结构
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+3 -1
View File
@@ -212,6 +212,8 @@
</el-table-column>
</el-table>
<pagination
:auto-size="true"
:page-size="sarProStatePageSize"
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@@ -251,7 +253,7 @@ export default {
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStatePageSize:20,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度
productId: "" // 符合性项目Id
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+3 -1
View File
@@ -309,6 +309,8 @@
</el-table-column>
</el-table>
<pagination
:auto-size="true"
:pageSize="sarProStatePageSize"
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@@ -483,7 +485,7 @@
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStatePageSize: 20,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null,
standId: '', // 符合性项目id
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -1
View File
@@ -564,6 +564,7 @@
width="875px"
:close-on-click-modal="false"
:append-to-body="true"
:destroy-on-close="true"
>
<div class="search-area">
<div class="left">
@@ -688,6 +689,7 @@
<pagination
style="position: relative;"
:page="page"
:autoSize="true"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@@ -743,7 +745,7 @@ export default {
}
],
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
drawerTitle: "",
//存放被勾选的项目的数据