Merge branch 'dev_test' into dev_20230829_change

# 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
312 changed files with 8247 additions and 789 deletions
@@ -84,6 +84,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) + (sarSarAccessEOSearch.page - 1) * sarSarAccessEOSearch.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="countryAreaShow"
label="国家/地区"
@@ -75,6 +75,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) + (sarSarAccessEOSearch.page - 1) * sarSarAccessEOSearch.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="detailedList"
label="清单类别"
@@ -171,6 +180,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
// 查询相关参数
sarSarAccessEOSearch: {
pageSize: this.$store.getters.userInfo.configContent,
detailedList: "",
detailedListName: "",
},
@@ -85,6 +85,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) + (sarSarAccessEOSearch.page - 1) * sarSarAccessEOSearch.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="carTypeShow"
label="车型类别"
@@ -173,6 +182,7 @@ export default {
rows: 10,
// 查询相关参数
sarSarAccessEOSearch: {
pageSize: this.$store.getters.userInfo.configContent,
carType: '',
projectName: "",
detailedListName: "",
@@ -310,6 +320,8 @@ export default {
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
this.sarSarAccessEOSearch.pageSize = pageSize;
this.searchSarAccess();
},
//清空
@@ -84,7 +84,7 @@
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (handleSelectForm.page - 1) * handleSelectForm.pageSize }}
{{ ($index + 1) + (sarSarAccessEOSearch.page - 1) * sarSarAccessEOSearch.pageSize }}
</template>
</el-table-column>
<el-table-column
@@ -351,7 +351,6 @@
align="center">
</el-table-column>
<el-table-column
fixed="left"
type="index"
width="55"
label="序号"
@@ -159,6 +159,16 @@
align="center"
>
</el-table-column>
<el-table-column
label="序号"
fixed
align="center"
type="index"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (drawerPage - 1) * sarAccessInfo.pageSize }}
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
fixed="left"
@@ -735,7 +745,7 @@
</div>
</el-drawer>
<!--导入模态窗-->
<el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true">
<el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true" :close-on-click-modal="false" v-drag-dialog-width>
<el-upload
drag
:show-file-list="showUploadlist"
@@ -113,6 +113,9 @@
fixed="left"
type="index"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (standardForm.page - 1) * standardForm.Size }}
</template>
</el-table-column>
<el-table-column
prop="standNumber"
@@ -139,6 +139,16 @@
align="center"
>
</el-table-column>
<el-table-column
label="序号"
fixed
align="center"
type="index"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (sarAccessInfo.page - 1) * sarAccessInfo.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
@@ -709,6 +719,7 @@ export default {
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: []
@@ -1660,8 +1671,8 @@ export default {
},
// 数据搜索table分页条数改变回调
drawerPageSizeChange () {
this.sarAccessInfo.Size = this.$store.getters.userInfo.configContent
drawerPageSizeChange (size) {
this.sarAccessInfo.pageSize = size
this.selectLawsStands()
},
// 点击 导出、全部导出按钮事件
@@ -156,6 +156,16 @@
align="center"
>
</el-table-column>
<el-table-column
label="序号"
fixed
align="center"
type="index"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (drawerPage - 1) * sarAccessInfo.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
@@ -154,10 +154,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="dialogVisible1"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -146,10 +146,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -52,6 +52,16 @@
type="selection"
width="50">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
prop="host"
@@ -300,10 +310,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -49,6 +49,16 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.pageSize }}
</template>
</el-table-column>
<el-table-column align="center" prop="unit" label="提报单位名称" width="120">
<template slot-scope="scope">
{{ scope.row.unit || '-' }}
@@ -323,10 +333,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -43,6 +43,16 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.pageSize }}
</template>
</el-table-column>
<el-table-column align="center" prop="scName" label="协会名称-标委会" width="150"/>
<el-table-column align="center" prop="sscName" label="协会名称-分标委" width="150"/>
<el-table-column align="center" prop="wgName" label="协会名称-工作组" width="150"/>
@@ -421,10 +431,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -46,6 +46,16 @@
type="selection"
width="50">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
prop="stage"
@@ -410,10 +420,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -153,10 +153,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -140,10 +140,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -177,10 +177,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -163,16 +163,18 @@
<el-dialog
title="导入文件"
:visible.sync="dialogVisible1"
width="30%"
width="400px"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-button class="leading-in">点击或拖拽上传文件</el-button>
</el-dialog>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -164,10 +164,11 @@
</el-drawer>
<!-- 导入 -->
<el-dialog
width="40%"
width="400px"
title="导入"
:visible.sync="visible.uploadData"
:show-footer="false"
:close-on-click-modal="false" v-drag-dialog-width
>
<el-upload
class="upload-demo"
@@ -215,6 +215,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 === '' ? sarStandardsSearch.page : tableFlag.page)-1) * (tableFlag === '' ? sarStandardsSearch.pageSize : tableFlag.pageSize)}}
</template>
</el-table-column>
<el-table-column
label="标准号"
width="150"
@@ -1152,6 +1161,15 @@
type="selection"
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
prop="standNumber"
label="标准号"
@@ -2185,6 +2203,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="fileName"
label="文件名"
@@ -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">
@@ -203,6 +203,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) + (standCommonlySearch.page - 1) * standCommonlySearch.pageSize }}
</template>
</el-table-column>
<el-table-column
label="标准号"
width="150"
@@ -1532,6 +1541,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
prop="standNumber"
label="标准号"
@@ -102,6 +102,16 @@
min-width="100"
label="产品平台">
</el-table-column>-->
<el-table-column
fixed="left"
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectGroup"
@@ -81,6 +81,16 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * size }}
</template>
</el-table-column>
<el-table-column
prop="standNumber"
label="标准号"
@@ -45,6 +45,16 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
prop="standType"
label="标准/政策类型"
@@ -150,9 +160,13 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
label="序号"
type="index"
width="50"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (sarProStateTotalPage - 1) * sarProStatePageSize }}
</template>
</el-table-column>
<el-table-column
width="180px"
@@ -47,6 +47,16 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
prop="standType"
label="标准/政策类型"
@@ -183,6 +193,16 @@
width="60"
>
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (sarProStateTotalPage - 1) * sarProStatePageSize }}
</template>
</el-table-column>
<el-table-column
sortable="custom"
show-overflow-tooltip
@@ -67,6 +67,16 @@
fixed="left"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
prop="standId"
width="180px"
@@ -109,6 +109,16 @@
fixed="left"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSizeNo }}
</template>
</el-table-column>
<el-table-column
prop="standSerialNumber"
fixed="left"
@@ -618,6 +628,16 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
prop="code"
align="center"
@@ -700,6 +720,8 @@ export default {
itemsData: [],
selectItems: [],
dataList: [],
pageSizeNo: this.$store.getters.userInfo.configContent,
//
standardSearch: {
standType: "",
@@ -47,6 +47,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (questionSerach.page - 1) * questionSerach.pageSize }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="分类" prop="classification" align="center" min-width="50" :formatter="formatClassification"></el-table-column>
<el-table-column show-overflow-tooltip label="标准号/问题分类" width="150" align="center" prop="standardEncdoing"></el-table-column>
<el-table-column show-overflow-tooltip label="标准名称" prop="standardName" align="center" min-width="100"></el-table-column>
@@ -217,7 +227,16 @@
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (handleSelectForm.page - 1) * handleSelectForm.pageSize }}
</template>
</el-table-column>
<div v-if="handleSelectForm.dataSource === 'INLAND'">
<el-table-column
label="标准号"
@@ -1139,8 +1158,11 @@ export default {
flex-direction: column;
background: #F5F7FA;
margin-bottom: 10px;
.tab-box{
height: 93%;
height: 93%; padding: 0 10px;
background-color: #fff;
}
.type-tabs {
/deep/.el-tabs__header {
@@ -66,6 +66,16 @@
height="100%"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (standCommonlySearch.page - 1) * standCommonlySearch.size }}
</template>
</el-table-column>
<el-table-column
prop="category"
label="标准/政策"