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

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

Browse Source
This commit is contained in:
Mr.Z
2021-08-27 14:44:31 +08:00
parent add1b5831e 98c40803d8
commit bad537f1ff
1 changed files with 909 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+85 -52
View File
@@ -82,7 +82,9 @@
<template slot="title">拆分信息</template> <template slot="title">拆分信息</template>
</ProcessTitle> </ProcessTitle>
<div class="action-bar"> <div class="action-bar">
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button> <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
批量编辑
</el-button>
</div> </div>
<el-table border <el-table border
ref="selection" ref="selection"
@@ -114,7 +116,9 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button> <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
查看条款内容
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -211,11 +215,13 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="sarStandCompareHisInfo">查询</el-button> @click="sarStandCompareHisInfo">查询
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空
</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -238,18 +244,18 @@
label="标准号/政策号" label="标准号/政策号"
width="170" width="170"
align="center"> align="center">
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>--> <!-- <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>--> <!-- <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fileTypeShow" prop="fileTypeShow"
@@ -300,7 +306,10 @@
label="标准号" label="标准号"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div> <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}
</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div> <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template> </template>
</el-table-column> </el-table-column>
@@ -321,7 +330,7 @@
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span> <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -329,7 +338,7 @@
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span> <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -357,7 +366,8 @@
size="800px"> size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div> <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer"> <div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
</el-button>
</div> </div>
</el-dialog> </el-dialog>
<Role-tree <Role-tree
@@ -372,11 +382,12 @@
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst } from 'api/process' import {saveTaskFirst} from 'api/process'
export default {
export default {
name: "bzjdStep1", name: "bzjdStep1",
data() { data() {
return { return {
@@ -409,10 +420,10 @@
}, },
formRules: { formRules: {
itemsNum: [ itemsNum: [
{ required: true, message: '请输入标准号/政策号', trigger: 'change' }, {required: true, message: '请输入标准号/政策号', trigger: 'change'},
], ],
itemsName: [ itemsName: [
{ required: true, message: '请输入标准名称/政策名称', trigger: 'change' }, {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
], ],
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
@@ -425,7 +436,7 @@
standCommonlySearch2: { standCommonlySearch2: {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
userId : this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
standType: 'INLAND' standType: 'INLAND'
}, },
spinShow: false, spinShow: false,
@@ -444,10 +455,10 @@
}, },
roleFormRules: { roleFormRules: {
zrUserId: [ zrUserId: [
{ required: true, message: '请选择责任部门对接人', trigger: 'change' }, {required: true, message: '请选择责任部门对接人', trigger: 'change'},
], ],
deptUserId: [ deptUserId: [
{ required: true, message: '请选择标准法规部部长', trigger: 'change' }, {required: true, message: '请选择标准法规部部长', trigger: 'change'},
], ],
}, },
treeData: [], treeData: [],
@@ -463,6 +474,7 @@
}, },
roleRow: {}, roleRow: {},
itemList: [], itemList: [],
itemListOld: [],
zrType: '', zrType: '',
zrIndex: '', zrIndex: '',
zrIdList: [] zrIdList: []
@@ -474,14 +486,14 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
itermsConditionsClose () { itermsConditionsClose() {
this.itermsConditionsFlag = false this.itermsConditionsFlag = false
}, },
itermsConditionsOpen (row) { itermsConditionsOpen(row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row
}, },
showUser (row) { showUser(row) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'ItemSplitInfo', name: 'ItemSplitInfo',
query: { query: {
@@ -499,7 +511,7 @@
// } // }
// }) // })
}, },
setMap(data){ setMap(data) {
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
}) })
@@ -519,7 +531,7 @@
/** 标准征求意见库方法* /** 标准征求意见库方法*
* **********************************************/ * **********************************************/
// 清空 // 清空
clearSearchStand () { clearSearchStand() {
this.standCommonlySearch.page = 1 this.standCommonlySearch.page = 1
this.standCommonlySearch.start = '' this.standCommonlySearch.start = ''
this.standCommonlySearch.end = '' this.standCommonlySearch.end = ''
@@ -533,7 +545,7 @@
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 查询表格 // 查询表格
sarStandCompareHis () { sarStandCompareHis() {
this.spinShow = true this.spinShow = true
var form = this.standCommonlySearch var form = this.standCommonlySearch
this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, { this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
@@ -545,7 +557,7 @@
}, e => { }, e => {
}) })
}, },
sarStandCompareHis2 () { sarStandCompareHis2() {
var form = this.standCommonlySearch2 var form = this.standCommonlySearch2
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
_this: this _this: this
@@ -569,22 +581,22 @@
}, e => { }, e => {
}) })
}, },
pageChange (page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.pageSize = pageSize
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
pageChange2 (page) { pageChange2(page) {
this.standCommonlySearch2.page = page this.standCommonlySearch2.page = page
this.sarStandCompareHis2() this.sarStandCompareHis2()
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange2 (pageSize) { pageSizeChange2(pageSize) {
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch2.pageSize = pageSize this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2() this.sarStandCompareHis2()
@@ -597,7 +609,7 @@
this.selectedList.push(data[i].id); this.selectedList.push(data[i].id);
} }
}, },
handleSelection2 (data) { handleSelection2(data) {
this.selectedList2 = []; this.selectedList2 = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectedList2.push(data[i].id); this.selectedList2.push(data[i].id);
@@ -643,9 +655,15 @@
if (res.ok) { if (res.ok) {
res.data.list.forEach(item => { res.data.list.forEach(item => {
item.zrUserId = '' item.zrUserId = ''
item.zrUserIdName= '' item.zrUserIdName = ''
})
this.itemList = res.data.list.filter(item =>{
return item.workFlowShow === '1'
})
this.itemListOld = res.data.list.filter(item =>{
return item.workFlowShow === '0'
}) })
this.itemList = res.data.list
} }
this.loading = false this.loading = false
}) })
@@ -691,7 +709,7 @@
}, },
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
saveUserInfo (data) { saveUserInfo(data) {
if (this.type === 0) { if (this.type === 0) {
this.roleForm.deptUserId = data[0].id this.roleForm.deptUserId = data[0].id
this.roleForm.deptUserIdName = data[0].name this.roleForm.deptUserIdName = data[0].name
@@ -699,8 +717,8 @@
this.itemList[this.zrIndex].zrUserId = data[0].id this.itemList[this.zrIndex].zrUserId = data[0].id
this.itemList[this.zrIndex].zrUserIdName = data[0].name this.itemList[this.zrIndex].zrUserIdName = data[0].name
} else { } else {
this.itemList.forEach( item => { this.itemList.forEach(item => {
this.zrIdList.forEach( items => { this.zrIdList.forEach(items => {
if (item.id === items) { if (item.id === items) {
item.zrUserId = data[0].id item.zrUserId = data[0].id
item.zrUserIdName = data[0].name item.zrUserIdName = data[0].name
@@ -710,7 +728,7 @@
} }
this.modalshowflag = false this.modalshowflag = false
}, },
choiceZRRS (row, type, index) { choiceZRRS(row, type, index) {
this.type = type this.type = type
if (type === 1) { if (type === 1) {
this.drawerTitle = '选择责任人' this.drawerTitle = '选择责任人'
@@ -736,9 +754,9 @@
this.modalshowflag = true this.modalshowflag = true
} }
}, },
handleSelectionChange (val) { handleSelectionChange(val) {
this.zrIdList = [] this.zrIdList = []
val.forEach( item => { val.forEach(item => {
this.zrIdList.push(item.id) this.zrIdList.push(item.id)
}) })
}, },
@@ -790,6 +808,7 @@
json.commentText = this.commentText json.commentText = this.commentText
json.standInData = this.sarType json.standInData = this.sarType
json.itemList = this.itemList json.itemList = this.itemList
json.itemListOld = this.itemListOld
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: res.data, taskId: res.data,
@@ -816,7 +835,7 @@
}) })
} }
}, },
mounted () { mounted() {
this.sarStandCompareHis() this.sarStandCompareHis()
this.sarStandCompareHis2() this.sarStandCompareHis2()
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
@@ -824,21 +843,24 @@
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
} }
}, },
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
.bzjdStep1 {
/deep/.el-drawer__container { .bzjdStep1 {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -846,6 +868,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 10px; right: 10px;
.headerTabsItem { .headerTabsItem {
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
padding: 0 5px; padding: 0 5px;
@@ -853,12 +876,14 @@
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
border: 1px solid #E6A23C; border: 1px solid #E6A23C;
color: #fff; color: #fff;
background: #E6A23C; background: #E6A23C;
} }
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -866,38 +891,46 @@
height: calc(~'100% - 107px'); height: calc(~'100% - 107px');
overflow: auto; overflow: auto;
} }
.standardForComments { .standardForComments {
height: 100%; height: 100%;
background: #fff; background: #fff;
.el-divider--horizontal { .el-divider--horizontal {
display: block; display: block;
height: 1px; height: 1px;
width: 100%; width: 100%;
margin: 0; margin: 0;
} }
flex-direction: column; flex-direction: column;
.action-bar { .action-bar {
margin-bottom: 5px; margin-bottom: 5px;
padding: 0; padding: 0;
} }
.content { .content {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.table-wrap { .table-wrap {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
} }
& > .pagination { & > .pagination {
position: static; position: static;
/deep/.pagination-slot {
/deep/ .pagination-slot {
padding: 0; padding: 0;
} }
} }
} }
} }
</style> </style>