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/components/CustomFormComponents/InputForAllStandards.vue
+9
View File
@@ -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) + (replacePage - 1) * replaceLawsNumForm.pageSize }}
</template>
</el-table-column>
<el-table-column
label="标准编号"
width="130">
src/components/CustomFormComponents/InputForAllStandards2.vue
+9
View File
@@ -88,6 +88,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="标准编号"
show-overflow-tooltip
src/components/CustomFormComponents/InputForPolicy.vue
+9
View File
@@ -78,6 +78,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="政策编号"
width="130">
src/components/CustomFormComponents/InputForRecord.vue
+9
View File
@@ -87,6 +87,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">
src/components/CustomFormComponents/InputForStandAndForeign.vue
+9
View File
@@ -90,6 +90,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">
src/components/CustomFormComponents/InputForStandards.vue
+9
View File
@@ -96,6 +96,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">
src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+9
View File
@@ -100,6 +100,15 @@
<!-- min-width="130"-->
<!-- >-->
<!-- </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="企标编号"
min-width="130">
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+9
View File
@@ -86,6 +86,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="标准编号"
width="130">
src/components/CustomFormComponents/InputForStandardsForLaws.vue
+9
View File
@@ -109,6 +109,15 @@
<!-- min-width="130"-->
<!-- >-->
<!-- </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="政策编号"
min-width="130">
src/components/OrgTable/index.vue
+10 -1
View File
@@ -93,6 +93,15 @@
align="center"
:selectable="isSelectable">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
</el-table-column>
<el-table-column
label="姓名"
width="120"
@@ -718,4 +727,4 @@ export default {
}
}
}
</style>
</style>
src/components/hzwlComponents/ReceiptDescription.vue
+18 -23
View File
@@ -1,31 +1,23 @@
<template>
<!--意见-->
<el-collapse v-model="activeName" accordion>
<el-collapse-item :title="title" name="1">
<div style="margin: 10px 0;">
<el-form-item :prop="prop" label-width="0">
<el-input :disabled="disabled"
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
:value="value"
@input="handleChange">
</el-input>
</el-form-item>
</div>
</el-collapse-item>
</el-collapse>
<el-form>
<div class="title">{{ title }}</div>
<el-form-item :prop="prop" label-width="0">
<el-input :disabled="disabled"
type="textarea"
:autosize="{ minRows: 3 }"
resize="none"
placeholder="请输入意见"
:value="value"
@input="handleChange">
</el-input>
</el-form-item>
</el-form>
</template>
<script>
export default {
name: "ReceiptDescription",
data () {
return {
activeName:'1',
}
},
props: {
value: {
type: String,
@@ -37,7 +29,7 @@ export default {
},
title: {
type: String,
required: true
default: '回执说明'
},
prop: {
type: String
@@ -52,5 +44,8 @@ export default {
</script>
<style scoped>
.title {
height: 48px;
line-height: 48px;
}
</style>
src/components/hzwlComponents/phone/PhoneScroll.vue
+110
View File
@@ -0,0 +1,110 @@
<template>
<div class="scroll-wrapper" ref="scroll" :style="{height: height}">
<div class="scroll-content" ref="content">
<slot></slot>
<van-loading
v-if="loading"
type="spinner"
size="16px"
text-size="12px"
color="#3170A8"
style="text-align: center"
>加载中...</van-loading>
<div v-if="data.length > 0 && data.length >= total" style="font-size: 12px;text-align: center;color: #999">已加载全部数据</div>
<van-empty v-if="!loading && data.length === 0" description="暂无数据" />
</div>
</div>
</template>
<script>
import BScroll from '@better-scroll/core'
import ScrollBar from '@better-scroll/scroll-bar'
import Pullup from '@better-scroll/pull-up'
BScroll.use(ScrollBar)
BScroll.use(Pullup)
export default {
name: "PhoneScroll",
props: {
// 容器wrapper高度
height: {
type: String,
default: '100%'
},
data: {
type: Array,
default: () => [],
required: true
},
// 是否加载中
loading: {
type: Boolean,
default: false,
required: true
},
// 总数
total: {
type: Number,
required: true
},
// 上拉加载回调
pullingUpHandler: {
type: Function,
default: () => {
console.log('请传入上拉加载回调函数参数pullingUpHandler')
}
},
},
data () {
return {
bs: null,
toEnd: false
}
},
watch: {
data() {
this.refreshScroll()
}
},
methods: {
refreshScroll () {
this.$nextTick(() => {
if (!this.bs) {
this.bs = new BScroll(this.$refs.scroll, {
probeType: 3,
scrollbar: true,
pullUpLoad: {
threshold: 50
},
click: true
})
this.bs && this.bs.on('pullingUp', () => {
this.pullingUpHandler()
// 结束上拉加载
this.bs.finishPullUp()
})
this.bs.on('scroll', ({x, y}) => { })
} else {
this.bs.refresh()
}
})
},
scrollTo (x, y ,time, easing) {
if (this.bs) {
this.bs.scrollTo(x, y, time, easing)
}
}
}
}
</script>
<style scoped>
.scroll-wrapper {
/*height: calc(100vh - 131px);*/
overflow: hidden;
position: relative;
}
</style>