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_20231201_feizhi

Browse Source
This commit is contained in:
zyn
2023-12-05 15:01:00 +08:00
parent 3bfdb1da01 c20ea9ccee
commit e334e1efc0
48 changed files with 208 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/common.less
+3
View File
@@ -396,3 +396,6 @@
border-color: #3986c9
}
.flow-list{
height: 100%;
}
src/components/CustomFormComponents/InputForAllStandards.vue
+3 -1
View File
@@ -131,6 +131,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -185,7 +187,7 @@ export default {
replaceLawsNumForm: {
standNumber: '', // 政策编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: '',
quoteIdList: '',
src/components/CustomFormComponents/InputForAllStandards2.vue
+3 -1
View File
@@ -143,6 +143,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -206,7 +208,7 @@
standNumber: '', // 政策编号
standName: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
quoteIdList: '',
src/components/CustomFormComponents/InputForPolicy.vue
+3 -1
View File
@@ -127,6 +127,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -187,7 +189,7 @@ export default {
replaceLawsNumForm: {
numberName: '', // 政策编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
lawsType: 'FOREIGN',
quoteIdList: '',
src/components/CustomFormComponents/InputForRecord.vue
+3 -1
View File
@@ -123,6 +123,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -183,7 +185,7 @@
// 代替标准号
replaceLawsNumForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'ALL',
quoteIdList: '',
src/components/CustomFormComponents/InputForStandAndForeign.vue
+3 -1
View File
@@ -126,6 +126,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -192,7 +194,7 @@ export default {
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
quoteIdList: '',
src/components/CustomFormComponents/InputForStandards.vue
+3 -1
View File
@@ -136,6 +136,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size = "replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -200,7 +202,7 @@ export default {
standNumber: '', // 标准编号
standName: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
quoteIdList: '',
src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+3 -1
View File
@@ -155,6 +155,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -215,7 +217,7 @@ export default {
dataSource: 'BUSINESS', // 数据来源
numberName: '', // 政策编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
quoteIdList: '',
menuId: '',
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+3 -1
View File
@@ -139,6 +139,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -206,7 +208,7 @@ export default {
replaceLawsNumForm: {
standNumber: '', // 政策编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'FOREIGN',
quoteIdList: '',
src/components/CustomFormComponents/InputForStandardsForLaws.vue
+3 -1
View File
@@ -152,6 +152,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -211,7 +213,7 @@ export default {
lawsNumber: '', // 政策编号
numberName: '', // 政策名称
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
quoteIdList: '',
menuId: '',
src/components/pagination/index.vue
+8 -3
View File
@@ -28,9 +28,14 @@ export default {
this.$emit('pageChange', page)
},
pageSizeChange (pageSize) {
this.userInfo.configContent = pageSize
this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
this.$emit('pageSizeChange', pageSize)
if(this.autoSize) {
this.$emit('pageSizeChange', pageSize)
}else{
this.userInfo.configContent = pageSize
this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
this.$emit('pageSizeChange', pageSize)
}
// if (this.getTypeFlag === 'CloudRepository') {
// this.userInfo.configContent = pageSize
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+1 -1
View File
@@ -248,7 +248,7 @@
:expand-on-click-node="false"
show-checkbox>
</el-tree>
<pagination :page="page1" :pageSize="pageSize1" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<pagination :auto-size="true" :page="page1" :pageSize="pageSize1" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
size="mini"
src/pages/details/otherStandardDetails/index.vue
+3 -1
View File
@@ -1000,6 +1000,8 @@
<loading :loading="tableLoading">数据加载中...</loading>
</div>
<pagination
:auto-size="true"
:page-size="pageSize7"
:page="page7"
:total="total7"
@pageChange="pageChange7"
@@ -1898,7 +1900,7 @@ export default {
orderBy: '',
total7: 0,
page7: 1,
pageSize7: this.$store.getters.userInfo.configContent,
pageSize7: 20,
addForm: {
title: '',
content: '',
src/pages/localTool/standAutoSplit/index.vue
+7 -4
View File
@@ -652,7 +652,9 @@
align="center"
width="130">
<template slot-scope="scope">
<p v-for="item in scope.row.issueTime.split(',')">{{ item }}</p>
<template v-if="scope.row.issueTime"> <p v-for="item in scope.row.issueTime.split(',')">{{ item }}</p>
</template>
<template v-else></template>
</template>
</el-table-column>
</el-table>
@@ -664,7 +666,7 @@
@pageChange="handlePageChange"
@pageSizeChange="handlePageSizeChange"
></pagination>
<loading :loading="loading">数据获取中</loading>
<loading :loading="dataLoading">数据获取中</loading>
</div>
<div class="demo-drawer-footer">
<el-button
@@ -904,7 +906,7 @@ export default {
lawsType: 'FOREIGN'
}, {
_this: this,
loading: 'loading'
loading: 'dataLoading'
}, res => {
if (res.ok) {
res.data.list.map(item => {
@@ -921,7 +923,7 @@ export default {
standNumber: this.conditionForm.numberName,
standType: this.conditionForm.standType
}, {
_this: this, loading: 'loading'
_this: this, loading: 'dataLoading'
}, res => {
if (res.ok) {
res.data.list.map(item => {
@@ -935,6 +937,7 @@ export default {
item.resType = this.conditionForm.standType === 'FOREIGN' ? 'FOREIGN_STAND' : 'INLAND_STAND'
})
this.tableData = res.data.list
console.log(this.tableData,"tableDatatableDatatableDatatableData")
this.total2 = res.data.count
}
})
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+1 -1
View File
@@ -536,7 +536,7 @@
// this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.docUser
// this.form.fileList = data.form ? data.form.fileList : []
this.commentText3 = data.commentText3 || data.commentText || ''
this.commentText3 = data.commentText3 || ''
this.form.fileName = data.form? data.form.fileName : data.fileName || ''
this.form.fileId = data.form ? data.form.fileId : data.fileId || ''
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz || ''
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+2 -1
View File
@@ -454,7 +454,8 @@ export default {
if (this.rh_pageData.fillFile !== undefined) {
this.fillFileList = this.rh_pageData.fillFile
}
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3 || ''
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+1 -1
View File
@@ -547,7 +547,7 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 || ''
this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+1 -1
View File
@@ -381,7 +381,7 @@ export default {
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3 || ''
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+1 -1
View File
@@ -410,7 +410,7 @@ export default {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 || ''
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+4 -2
View File
@@ -371,6 +371,7 @@
</div>
</div>
<pagination
:auto-size="true"
:page="page"
:pageSize="pageSize"
:total="total"
@@ -494,6 +495,7 @@
</div>
</div>
<pagination
:auto-size="true"
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@@ -646,10 +648,10 @@ export default {
dataList: [],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
pageNo: 1,
totalNo: 0,
pageSizeNo: this.$store.getters.userInfo.configContent,
pageSizeNo: 20,
product: new Map(),
hisListForm:{},
listForm: {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+4 -2
View File
@@ -538,6 +538,7 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page="page"
:pageSize="pageSize"
:total="total"
@@ -690,6 +691,7 @@
</div>
</div>
<pagination
:auto-size="true"
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@@ -847,10 +849,10 @@ export default {
bringData: [],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
pageNo: 1,
totalNo: 0,
pageSizeNo: this.$store.getters.userInfo.configContent,
pageSizeNo: 20,
listForm: {
listType: "", //区分是哪个清单
listName: "", //清单名称
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -4
View File
@@ -1329,6 +1329,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -1503,6 +1505,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -1655,7 +1659,7 @@
verifySarStandard: false,
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -1693,7 +1697,7 @@
standNumber: '', // 标准编号
standName: '', // 标准名称
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
quoteIdList: '',
@@ -3075,7 +3079,7 @@
this.replaceLawsNumForm = {
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
quoteIdList: '',
@@ -3101,7 +3105,7 @@
standName: '',
standNumber: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
}
this.replaceLawsNumModel = true
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+39 -4
View File
@@ -192,6 +192,10 @@
</el-table-column>
</el-table>
</div>
<ReceiptDescription
title="回执说明"
v-model="commentStep"
></ReceiptDescription>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -259,6 +263,7 @@
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 添加标准抽屉-->
<el-drawer
@@ -329,7 +334,11 @@
width="55"
align="center">
</el-table-column>
<el-table-column type="index" width="55" label="序号" align="center"/>
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSizeNo }}
</template>
</el-table-column>
<el-table-column
prop="code"
align="center"
@@ -408,17 +417,21 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { inboundLiaisonDetail } from "api/process";
import { inboundLiaisonDetail ,saveTaskForPub } from "api/process";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default {
name: "cywbbzzxdStep3",
components: {
ReceiptDescription,
ProcessHeader,
ProcessTitle,
ProcessFooter
},
data() {
return {
taskIds:'',
commentStep:'',
//切换tab
active: "1",
foldFormFlag: true,
@@ -507,6 +520,7 @@ export default {
};
},
mounted() {
this.taskIds=this.$route.query.taskIds
this.getData();
this.processTable();
this.getStandData()
@@ -533,6 +547,7 @@ export default {
this.$nextTick(() => {
if(item.wbbzform !== undefined){
this.wbbzform = item.wbbzform
this.commentStep = JSON.parse(JSON.stringify(item)).commentStep || ''
this.participantsData = item.participantsData
}else{
return
@@ -638,6 +653,23 @@ export default {
},
handleSave() {
this.saveLoading = true
this.isSubmit = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
wbbzform: this.wbbzform,
participantsData: this.participantsData,
commentStep: this.commentStep
}))
saveTaskForPub(_formData).then(res => {
this.$message.success('保存成功')
this.bpnId = res.result
}).finally(() => {
this.isSubmit = false
this.saveLoading = false
})
},
//不备案
handleRecord() {
@@ -668,7 +700,7 @@ export default {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
this.wbbzform.commentText = this.commentStep;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
@@ -702,7 +734,7 @@ export default {
projectNumber: this.projectNumber,
projectName: this.projectName,
expenses: this.expenses,
costBudget: this.costBudget
costBudget: this.costBudget,
};
this.participantsData.push(list);
},
@@ -723,6 +755,9 @@ export default {
</script>
<style lang="less" scoped>
.demo-drawer-footer{
height:6% !important;
}
.wbbz-step1 {
height: 100%;
position: relative;
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue
+8 -2
View File
@@ -152,6 +152,10 @@
</el-table-column>
</el-table>
</div>
<ReceiptDescription
title="回执说明"
v-model="commentText"
></ReceiptDescription>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -249,17 +253,19 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default {
name: "cywbbzzxdStep4",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
ProcessFooter,
ReceiptDescription
},
data() {
return {
//切换tab
commentText:'',
active: "1",
foldFormFlag: true,
isSubmit: false,
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue
+9 -3
View File
@@ -152,6 +152,10 @@
</el-table-column>
</el-table>
</div>
<ReceiptDescription
title="回执说明"
v-model="commentText"
></ReceiptDescription>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -249,17 +253,19 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default {
name: "cywbbzzxdStep5",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
ProcessFooter,
ReceiptDescription
},
data() {
return {
//切换tab
commentText:'',
//切换tab,
active: "1",
foldFormFlag: true,
isSubmit: false,
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue
+8 -2
View File
@@ -152,6 +152,10 @@
</el-table-column>
</el-table>
</div>
<ReceiptDescription
title="回执说明"
v-model="commentText"
></ReceiptDescription>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -249,16 +253,18 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default {
name: "cywbbzzxdStep6",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
ProcessFooter,
ReceiptDescription
},
data() {
return {
commentText:'',
//切换tab
active: "1",
foldFormFlag: true,
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+2
View File
@@ -538,6 +538,8 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm.commentText = ''
this.commentText = ''
this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+2 -2
View File
@@ -1904,7 +1904,7 @@ export default {
// this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
// this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
// this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.commentText = mes.commentTexts || ''
this.ccc = false
})
}else {
@@ -2992,7 +2992,7 @@ export default {
taskInfo: '技术标准起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentTexts: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+5 -1
View File
@@ -933,6 +933,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -1286,6 +1288,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="tableCount"
@pageChange="handleStandardPageChange"
@@ -1565,7 +1569,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+6 -2
View File
@@ -269,6 +269,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -424,6 +426,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -595,7 +599,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -636,7 +640,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+3
View File
@@ -269,6 +269,9 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+6 -2
View File
@@ -394,6 +394,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -548,6 +550,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -720,7 +724,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -761,7 +765,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+6 -2
View File
@@ -326,6 +326,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -486,6 +488,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -700,7 +704,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize:20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -741,7 +745,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+6 -2
View File
@@ -272,6 +272,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -426,6 +428,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -596,7 +600,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -637,7 +641,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+6
View File
@@ -27,6 +27,12 @@
show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+6 -2
View File
@@ -531,6 +531,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -691,6 +693,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -935,7 +939,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -976,7 +980,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+4
View File
@@ -380,6 +380,8 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
<!--分页-->
<pagination
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
style="position: relative;"
:page="replacePage"
:total="replaceTotal"
@@ -540,6 +542,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+3 -1
View File
@@ -419,6 +419,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -611,7 +613,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+6 -2
View File
@@ -382,6 +382,8 @@
<!--分页-->
<pagination
style="position: relative;"
:auto-size="true"
:page-size="replaceLawsNumForm.pageSize"
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@@ -536,6 +538,8 @@
</el-table>
</div>
<pagination
:auto-size="true"
:page-size="standardSearchForm.pageSize"
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@@ -729,7 +733,7 @@
},
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'INLAND',
standSort: '',
@@ -770,7 +774,7 @@
dataSource: '',
standNumber: '', // 标准编号
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
total: 0,
standType: 'BUSINESS',
quoteIdList: '',
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+3 -3
View File
@@ -296,7 +296,7 @@
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<pagination :auto-size="true" :page="QYBZform.page" :page-size="QYBZform.pageSize" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中……</loading>
</div>
</div>
@@ -498,7 +498,7 @@ export default {
},
total: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
QYBZmodal: false,
TXJGmodal: false,
modalshowflagZRBM: false,
@@ -514,7 +514,7 @@ export default {
standSystemOptions: [],
QYBZform: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+4 -3
View File
@@ -349,6 +349,7 @@
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
</div>
<pagination
:auto-size="true"
:page="page"
:pageSize="pageSize"
:total="total"
@@ -457,7 +458,7 @@
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<pagination :auto-size="true" :page-size="QYBZform.pageSize" :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中……</loading>
</div>
</div>
@@ -650,7 +651,7 @@ export default {
standSystemOptions: [],
QYBZform: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
@@ -674,7 +675,7 @@ export default {
showType: '',
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
selectList: [],
qbfsFormRules: {
bussSort: [
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+2 -2
View File
@@ -432,7 +432,7 @@
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<pagination :auto-size="true" :page-size="QYBZform.pageSize" :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中……</loading>
</div>
</div>
@@ -679,7 +679,7 @@ export default {
standSystemOptions: [],
QYBZform: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
pageSize: 20,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1 -1
View File
@@ -302,7 +302,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo || ''
})
},
// 批量选择分发责任人
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -1
View File
@@ -290,7 +290,7 @@ export default {
if (item.responUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = listJSON
this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
this.commentInput = JSON.parse(JSON.stringify(item)).commentInput || ''
} else {
if (item.dockUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
-10
View File
@@ -284,16 +284,6 @@
</template>
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
<ReceiptDescription
title="回执说明"
v-model="commentText"
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
-10
View File
@@ -179,16 +179,6 @@
label="责任人">
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
<ReceiptDescription
title="审批意见"
v-model="commentText"
src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue
+1 -10
View File
@@ -178,16 +178,7 @@
label="责任人">
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<div>
<el-collapse accordion v-model="activeNames">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
-10
View File
@@ -179,16 +179,6 @@
label="责任人">
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
<ReceiptDescription
title="审批意见"
v-model="commentText"