Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yangzijiao
@@ -361,7 +361,7 @@ export default {
|
|||||||
page: 1,
|
page: 1,
|
||||||
pageSize: this.$store.getters.userInfo.configContent,
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
total: 0,
|
total: 0,
|
||||||
standType: 'INLAND',
|
standType: 'ALL',
|
||||||
quoteIdList: '',
|
quoteIdList: '',
|
||||||
validFlag: '0'
|
validFlag: '0'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -329,7 +329,7 @@ export default {
|
|||||||
page: 1,
|
page: 1,
|
||||||
pageSize: this.$store.getters.userInfo.configContent,
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
total: 0,
|
total: 0,
|
||||||
standType: 'FOREIGN',
|
standType: 'ALL',
|
||||||
quoteIdList: '',
|
quoteIdList: '',
|
||||||
validFlag: '0'
|
validFlag: '0'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,7 +146,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -147,7 +147,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -135,7 +135,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -174,7 +174,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -0,0 +1,622 @@
|
|||||||
|
<template>
|
||||||
|
<div class="bzzqyjStep1-1">
|
||||||
|
<!-- 标准征求意见流程-->
|
||||||
|
<ProcessHeader toggle>
|
||||||
|
<template slot="proName">标准征求意见流程</template>
|
||||||
|
<template slot="proNode">申请人发起流程</template>
|
||||||
|
</ProcessHeader>
|
||||||
|
<div class="headerTabs">
|
||||||
|
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||||
|
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
|
||||||
|
</div>
|
||||||
|
<div class="content" v-show="active === '1'">
|
||||||
|
<div style="flex: auto; overflow: auto;">
|
||||||
|
<el-form
|
||||||
|
ref="bzzqyjForm"
|
||||||
|
:model="form"
|
||||||
|
:rules="formRules"
|
||||||
|
class="label-input-form"
|
||||||
|
label-width="210px"
|
||||||
|
>
|
||||||
|
<ProcessTitle>
|
||||||
|
<template slot="title">基础信息</template>
|
||||||
|
</ProcessTitle>
|
||||||
|
<div class="prc-content-border">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
|
||||||
|
<div class="addButton">
|
||||||
|
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.cid"
|
||||||
|
placeholder="请输入标准编号"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
disabled
|
||||||
|
v-model="form.cname"
|
||||||
|
placeholder="请输入标准名称"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="form.endTime"
|
||||||
|
type="date"
|
||||||
|
placeholder="请选择结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
<el-collapse accordion>
|
||||||
|
<el-collapse-item title="意见填写">
|
||||||
|
<div style="margin: 10px 0;">
|
||||||
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
resize="none"
|
||||||
|
placeholder="请输入意见"
|
||||||
|
v-model="commentText">
|
||||||
|
</el-input>
|
||||||
|
</div>
|
||||||
|
</el-collapse-item>
|
||||||
|
</el-collapse>
|
||||||
|
</div>
|
||||||
|
<div class="content" v-show="active === '2'">
|
||||||
|
<div class="block" style="padding-top: 20px;">
|
||||||
|
<el-timeline>
|
||||||
|
<el-form
|
||||||
|
ref="Form"
|
||||||
|
:model="roleForm"
|
||||||
|
:rules="roleFormRules"
|
||||||
|
class="label-input-form myForm">
|
||||||
|
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<el-form-item prop="startUserName" style="margin-bottom: 0">
|
||||||
|
<h4>流程发起人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="roleForm.startUser" style="display: none;"/>
|
||||||
|
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<el-form-item prop="dockUserList" style="margin-bottom: 0">
|
||||||
|
<h4>责任部门对接人</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
|
||||||
|
<el-input
|
||||||
|
v-model="roleForm.dockUserListName"
|
||||||
|
placeholder="选择责任部门对接人"
|
||||||
|
@click.native="choiceZRRS">
|
||||||
|
</el-input>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<el-form-item prop="ministerUser" style="margin-bottom: 0">
|
||||||
|
<h4>标准法规部部长</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
|
||||||
|
<el-input
|
||||||
|
v-model="roleForm.ministerUserName"
|
||||||
|
placeholder="选择标准法规部部长·"
|
||||||
|
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<el-form-item prop="directorUser" style="margin-bottom: 0">
|
||||||
|
<h4>技术管理中心主任</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="roleForm.directorUser" style="display: none;"/>
|
||||||
|
<el-input
|
||||||
|
v-model="roleForm.directorUserName"
|
||||||
|
placeholder="选择技术管理中心主任"
|
||||||
|
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||||
|
<el-card>
|
||||||
|
<el-form-item prop="presidentUser" style="margin-bottom: 0">
|
||||||
|
<h4>工程研究总院院长</h4>
|
||||||
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
|
<el-input v-model="roleForm.presidentUser" style="display: none;"/>
|
||||||
|
<el-input
|
||||||
|
v-model="roleForm.presidentUserName"
|
||||||
|
placeholder="选择工程研究总院院长"
|
||||||
|
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-card>
|
||||||
|
</el-timeline-item>
|
||||||
|
</el-form>
|
||||||
|
</el-timeline>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<ProcessFooter
|
||||||
|
show-submit
|
||||||
|
:submitLoading="isSubmit"
|
||||||
|
:saveLoading="saveLoading"
|
||||||
|
@save="handleSave"
|
||||||
|
@submit="handleSubmit"
|
||||||
|
>
|
||||||
|
</ProcessFooter>
|
||||||
|
<el-drawer
|
||||||
|
title="标准库"
|
||||||
|
:visible.sync="listModel"
|
||||||
|
size="900px"
|
||||||
|
custom-class="demo-drawer"
|
||||||
|
>
|
||||||
|
<div class="standardForComments">
|
||||||
|
<div class="content">
|
||||||
|
<!-- 顶部工具栏 -->
|
||||||
|
<table-tools-bar>
|
||||||
|
<div slot="left">
|
||||||
|
<div class="search-area">
|
||||||
|
<el-form :model="standCommonlySearch" inline class="label-input-form">
|
||||||
|
<el-formItem label="标准号/名称" prop="standNumber" class="search-item">
|
||||||
|
<el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
|
||||||
|
</el-formItem>
|
||||||
|
<el-formItem label="标准类别" prop="standSort" class="search-item">
|
||||||
|
<el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
|
||||||
|
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-formItem>
|
||||||
|
<el-formItem label="标准来源" prop="standType" class="search-item">
|
||||||
|
<el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
|
||||||
|
<el-option value="INLAND" key="1" label="国内标准"></el-option>
|
||||||
|
<el-option value="FOREIGN" key="2" label="海外标准"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-formItem>
|
||||||
|
<el-formItem class="search-item btn-box">
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
size="mini"
|
||||||
|
class="common-button-primary"
|
||||||
|
|
||||||
|
@click="sarStandCompareHisInfo">查询</el-button>
|
||||||
|
<el-button
|
||||||
|
class="common-button-default"
|
||||||
|
size="mini"
|
||||||
|
@click="clearSearchStand">清空</el-button>
|
||||||
|
</el-formItem>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</table-tools-bar>
|
||||||
|
<div class="table-wrap">
|
||||||
|
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
|
||||||
|
<el-table
|
||||||
|
ref="selection"
|
||||||
|
:data="standInfoList"
|
||||||
|
tooltip-effect="dark"
|
||||||
|
style="width: 100%;padding:0 0 20px 0;"
|
||||||
|
height="100%"
|
||||||
|
border
|
||||||
|
@selection-change="handleSelection"
|
||||||
|
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||||
|
<el-table-column type="selection" width="55" align="center"/>
|
||||||
|
<el-table-column label="标准号" align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<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>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="cname" label="标准名称" align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<div>{{ scope.row.standName }}</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
||||||
|
<loading :loading="spinShow">数据加载中……</loading>
|
||||||
|
<div class="demo-drawer-footer">
|
||||||
|
<el-button size="mini" @click="closeDrawer">取消</el-button>
|
||||||
|
<el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
|
<Role-tree
|
||||||
|
is-title="选择责任部门对接人"
|
||||||
|
:is-visible.sync="modalshowflag2"
|
||||||
|
@checkedRole="checkedRole2"
|
||||||
|
:nodeList="nodeList2"
|
||||||
|
></Role-tree>
|
||||||
|
<Role-tree
|
||||||
|
check-box
|
||||||
|
:is-title="drawerTitle"
|
||||||
|
:is-visible.sync="modalshowflag"
|
||||||
|
@checkedRole="checkedRole"
|
||||||
|
:nodeList="nodeList"
|
||||||
|
></Role-tree>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import ProcessHeader from '../../components/ProcessHeader'
|
||||||
|
import ProcessFooter from '../../components/ProcessFooter'
|
||||||
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
|
import { saveTaskFirst, queryTaskFirst } from 'api/process'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "bzzqyjStep1-1",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
commentText: '',
|
||||||
|
textarea: '', // 意见
|
||||||
|
title: '', // 新增抽屉标题
|
||||||
|
listModel: false, // 新增抽屉开关
|
||||||
|
active: '1', // 默认显示
|
||||||
|
isSubmit: false,
|
||||||
|
saveLoading: false,
|
||||||
|
// 基础信息form表单
|
||||||
|
form: {
|
||||||
|
cid: '', // 编号
|
||||||
|
endTime: '', // 结束日期
|
||||||
|
cname: '', // 名称
|
||||||
|
},
|
||||||
|
formRules: {
|
||||||
|
cid: [
|
||||||
|
{ required: true, message: '请输入标准编号', trigger: 'change' },
|
||||||
|
],
|
||||||
|
endTime: [
|
||||||
|
{ required: true, message: '请输入标准结束日期', trigger: 'change' },
|
||||||
|
],
|
||||||
|
cname: [
|
||||||
|
{ required: true, message: '请输入标准名称', trigger: 'change' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 标准征求意见数据可库
|
||||||
|
standCommonlySearch: {
|
||||||
|
standSort: '',
|
||||||
|
standNumber: '',
|
||||||
|
standType: '',
|
||||||
|
page: 1,
|
||||||
|
pageSize: this.$store.getters.userInfo.configContent
|
||||||
|
},
|
||||||
|
spinShow: false,
|
||||||
|
standInfoList: [],
|
||||||
|
tableHeight: null,
|
||||||
|
total: 0,
|
||||||
|
selectedList: [],
|
||||||
|
data: [],
|
||||||
|
roleForm: {
|
||||||
|
startUserName: this.$store.getters.userInfo.userName,
|
||||||
|
startUser: this.$store.getters.userInfo.userId,
|
||||||
|
dockUserList: '',
|
||||||
|
dockUserListName: '',
|
||||||
|
ministerUser: '',
|
||||||
|
ministerUserName: '',
|
||||||
|
directorUser: '',
|
||||||
|
directorUserName: '',
|
||||||
|
presidentUser: '',
|
||||||
|
presidentUserName: '',
|
||||||
|
},
|
||||||
|
roleFormRules: {
|
||||||
|
dockUserList: [
|
||||||
|
{ required: true, message: '请选择责任部门对接人', trigger: 'change' },
|
||||||
|
],
|
||||||
|
ministerUser: [
|
||||||
|
{ required: true, message: '请选择标准法规部部长', trigger: 'change' },
|
||||||
|
],
|
||||||
|
directorUser: [
|
||||||
|
{ required: true, message: '请选择技术管理中心主任', trigger: 'change' },
|
||||||
|
],
|
||||||
|
presidentUser: [
|
||||||
|
{ required: true, message: '请选择工程研究院院长', trigger: 'change' },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
nodeList: [],
|
||||||
|
nodeList2: [],
|
||||||
|
type: '',
|
||||||
|
drawerTitle: '',
|
||||||
|
modalshowflag: false,
|
||||||
|
modalshowflag2: false,
|
||||||
|
standSortOptions: [],
|
||||||
|
}
|
||||||
|
},
|
||||||
|
components: {
|
||||||
|
ProcessHeader,
|
||||||
|
ProcessFooter,
|
||||||
|
ProcessTitle
|
||||||
|
},
|
||||||
|
mounted () {
|
||||||
|
this.getData()
|
||||||
|
this.sarStandCompareHis()
|
||||||
|
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
|
this.tableHeight = $('.content').height() - 44
|
||||||
|
window.onresize = () => {
|
||||||
|
this.tableHeight = $('.content').height() - 44
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
getData () {
|
||||||
|
queryTaskFirst({
|
||||||
|
bpnId: this.$route.query.bpnId
|
||||||
|
}).then(res => {
|
||||||
|
let mes = JSON.parse(res.mes)
|
||||||
|
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
|
||||||
|
this.form = mes.form
|
||||||
|
this.roleForm = mes.roleForm
|
||||||
|
this.commentText = mes.commentText
|
||||||
|
})
|
||||||
|
},
|
||||||
|
addZqyjList() {
|
||||||
|
this.title = '国内外标准库'
|
||||||
|
this.listModel = true
|
||||||
|
},
|
||||||
|
/** 标准征求意见库方法*
|
||||||
|
* **********************************************/
|
||||||
|
// 清空
|
||||||
|
clearSearchStand () {
|
||||||
|
this.standCommonlySearch.page = 1
|
||||||
|
this.standCommonlySearch.standSort = ''
|
||||||
|
this.standCommonlySearch.standNumber = ''
|
||||||
|
this.standCommonlySearch.standType = ''
|
||||||
|
this.sarStandCompareHis()
|
||||||
|
},
|
||||||
|
// 搜索
|
||||||
|
sarStandCompareHisInfo() {
|
||||||
|
this.standCommonlySearch.page = 1
|
||||||
|
this.sarStandCompareHis()
|
||||||
|
},
|
||||||
|
// 查询表格
|
||||||
|
sarStandCompareHis () {
|
||||||
|
this.spinShow = true
|
||||||
|
var formData = this.standCommonlySearch
|
||||||
|
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.standInfoList = res.data.list
|
||||||
|
this.total = res.data.count
|
||||||
|
this.spinShow = false
|
||||||
|
})
|
||||||
|
// var form = this.standCommonlySearch
|
||||||
|
// this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
|
||||||
|
// _this: this
|
||||||
|
// }, res => {
|
||||||
|
// this.standInfoList = res.data.records
|
||||||
|
// this.total = res.data.total
|
||||||
|
// this.spinShow = false
|
||||||
|
// }, e => {
|
||||||
|
// })
|
||||||
|
},
|
||||||
|
pageChange (page) {
|
||||||
|
this.standCommonlySearch.page = page
|
||||||
|
this.sarStandCompareHis()
|
||||||
|
},
|
||||||
|
// 分页每页显示数改变后方法
|
||||||
|
pageSizeChange (pageSize) {
|
||||||
|
this.$store.getters.userInfo.configContent = pageSize
|
||||||
|
this.standCommonlySearch.size = pageSize
|
||||||
|
this.sarStandCompareHis()
|
||||||
|
},
|
||||||
|
/** 选择带入数据的方法操作
|
||||||
|
* */
|
||||||
|
handleSelection(data) {
|
||||||
|
this.selectedList = [];
|
||||||
|
for (let i = 0; i < data.length; i++) {
|
||||||
|
this.selectedList.push(data[i].id);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
closeDrawer() {
|
||||||
|
this.listModel = false
|
||||||
|
},
|
||||||
|
enterDrawer() {
|
||||||
|
if (this.selectedList.length === 1) {
|
||||||
|
let deposit = new Map();
|
||||||
|
this.standInfoList.forEach(item => {
|
||||||
|
deposit.set(item.id, item);
|
||||||
|
});
|
||||||
|
let bringData = [];
|
||||||
|
for (let i = 0; i < this.selectedList.length; i++) {
|
||||||
|
bringData.push(deposit.get(this.selectedList[i]));
|
||||||
|
}
|
||||||
|
if (bringData[0].standYear) {
|
||||||
|
this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
|
||||||
|
} else {
|
||||||
|
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
|
||||||
|
}
|
||||||
|
this.form.cname = bringData[0].standName;
|
||||||
|
this.listModel = false;
|
||||||
|
} else if (this.selectedList.length > 1) {
|
||||||
|
this.$message.warning("只能选择一条数据进行带入");
|
||||||
|
} else {
|
||||||
|
this.$message.warning("请选择一条数据进行带入");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
/*** **********************************************/
|
||||||
|
/** 流程节点负责人的选择 *****************************/
|
||||||
|
checkedRole2 (data) {
|
||||||
|
var idList = ''
|
||||||
|
var nameList = ''
|
||||||
|
data.forEach( item => {
|
||||||
|
if (nameList.length > 0) {
|
||||||
|
nameList += ','
|
||||||
|
idList += ','
|
||||||
|
}
|
||||||
|
idList += item.id
|
||||||
|
nameList += item.name
|
||||||
|
})
|
||||||
|
this.roleForm.dockUserList = idList
|
||||||
|
this.roleForm.dockUserListName = nameList
|
||||||
|
},
|
||||||
|
checkedRole (data) {
|
||||||
|
if (this.type === 'ministerUser') {
|
||||||
|
this.roleForm.ministerUser = data[0].id
|
||||||
|
this.roleForm.ministerUserName = data[0].name
|
||||||
|
} else if (this.type === 'directorUser') {
|
||||||
|
this.roleForm.directorUser = data[0].id
|
||||||
|
this.roleForm.directorUserName = data[0].name
|
||||||
|
} else if (this.type === 'presidentUser') {
|
||||||
|
this.roleForm.presidentUser = data[0].id
|
||||||
|
this.roleForm.presidentUserName = data[0].name
|
||||||
|
}
|
||||||
|
},
|
||||||
|
choiceZRRS () {
|
||||||
|
this.nodeList2 = []
|
||||||
|
if ( this.roleForm.dockUserList.length > 0) {
|
||||||
|
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||||
|
}
|
||||||
|
this.modalshowflag2 = true
|
||||||
|
},
|
||||||
|
choiceZRR (type, title, id) {
|
||||||
|
this.nodeList = []
|
||||||
|
this.nodeList.push(id)
|
||||||
|
this.type = type
|
||||||
|
this.drawerTitle = title
|
||||||
|
this.modalshowflag = true
|
||||||
|
},
|
||||||
|
handleTabs(name) {
|
||||||
|
this.active = name
|
||||||
|
},
|
||||||
|
handleSave() {},
|
||||||
|
handleSubmit() {
|
||||||
|
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.$refs['Form'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.isSubmit = true
|
||||||
|
this.$http.get('lawss/activiti/startProcess', {
|
||||||
|
type: '3'
|
||||||
|
}, {}, res => {
|
||||||
|
if (res.ok) {
|
||||||
|
var json = Object.assign(this.form, this.roleForm)
|
||||||
|
json.commentText = this.commentText
|
||||||
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
|
json: JSON.stringify(json),
|
||||||
|
taskId: res.data,
|
||||||
|
userId: this.$store.getters.userInfo.userId
|
||||||
|
}, {}, res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$message.success('流程发起成功')
|
||||||
|
this.$router.push('/processCenter')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.$message.warning('流程启动失败')
|
||||||
|
}
|
||||||
|
this.isSubmit = false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return this.$message.warning('请完善人员信息')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return this.$message.warning('请完善基础信息')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="less" scoped>
|
||||||
|
@import '~@/assets/styles/style';
|
||||||
|
@import '~@/assets/styles/mixins';
|
||||||
|
.bzzqyjStep1-1 {
|
||||||
|
.myForm {
|
||||||
|
/deep/.el-form-item__content {
|
||||||
|
line-height: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/deep/.el-drawer__container {
|
||||||
|
.prc-content-border {
|
||||||
|
border: none;
|
||||||
|
padding: 0 20px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
position: relative;
|
||||||
|
height: 100%;
|
||||||
|
.headerTabs {
|
||||||
|
height: 52px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 10px;
|
||||||
|
.headerTabsItem {
|
||||||
|
border: 1px solid #c1c1c1;
|
||||||
|
padding: 0 5px;
|
||||||
|
height: 30px;
|
||||||
|
line-height: 30px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.active {
|
||||||
|
border: 1px solid #E6A23C;
|
||||||
|
color: #fff;
|
||||||
|
background: #E6A23C;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
|
height: calc(~'100% - 107px');
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
.standardForComments {
|
||||||
|
height: 100%;
|
||||||
|
background: #fff;
|
||||||
|
.el-divider--horizontal {
|
||||||
|
display: block;
|
||||||
|
height: 1px;
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
flex-direction: column;
|
||||||
|
.action-bar {
|
||||||
|
margin-bottom: 5px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
.content {
|
||||||
|
flex: auto;
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
.table-wrap {
|
||||||
|
flex: auto;
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
& > .pagination {
|
||||||
|
position: static;
|
||||||
|
/deep/.pagination-slot {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -263,6 +263,7 @@
|
|||||||
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'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bzzqyjStep1",
|
name: "bzzqyjStep1",
|
||||||
@@ -489,7 +490,26 @@ export default {
|
|||||||
handleTabs(name) {
|
handleTabs(name) {
|
||||||
this.active = name
|
this.active = name
|
||||||
},
|
},
|
||||||
handleSave() {},
|
handleSave() {
|
||||||
|
this.saveLoading = true
|
||||||
|
let _formData = new FormData()
|
||||||
|
_formData.append('id', this.bpnId || '')
|
||||||
|
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
||||||
|
_formData.append('createUserName', this.$store.getters.userInfo.userName)
|
||||||
|
_formData.append('prcType', '3')
|
||||||
|
_formData.append('json', JSON.stringify({
|
||||||
|
form: this.form,
|
||||||
|
roleForm: this.roleForm,
|
||||||
|
commentText: this.commentText
|
||||||
|
}))
|
||||||
|
saveTaskFirst(_formData).then(res => {
|
||||||
|
this.saveLoading = false
|
||||||
|
this.$message.success('保存成功')
|
||||||
|
this.bpnId = res.result
|
||||||
|
}).catch(e => {
|
||||||
|
this.saveLoading = false
|
||||||
|
})
|
||||||
|
},
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
|
|||||||
@@ -135,7 +135,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
@@ -264,6 +263,7 @@
|
|||||||
this.form.endTime = data.endTime
|
this.form.endTime = data.endTime
|
||||||
this.form.cname = data.cname
|
this.form.cname = data.cname
|
||||||
this.json = data
|
this.json = data
|
||||||
|
console.log(data);
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -184,7 +184,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -167,7 +167,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -193,7 +193,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -184,7 +184,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -184,7 +184,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -184,7 +184,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -184,7 +184,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-save
|
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
|
|||||||
@@ -83,7 +83,8 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="责任人" prop="workPeople" align="center">
|
<el-table-column label="责任人" prop="workPeople" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div :class="{'fileClass': !scope.row.workPeople}">{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
|
<div :class="{'fileClass': !scope.row.workPeople}">
|
||||||
|
{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|||||||
@@ -212,7 +212,6 @@ export default {
|
|||||||
this.queryProcess()
|
this.queryProcess()
|
||||||
},
|
},
|
||||||
dealWith (row) { // 办理
|
dealWith (row) { // 办理
|
||||||
debugger
|
|
||||||
//草稿办理待开发
|
//草稿办理待开发
|
||||||
const { prcType, id } = row
|
const { prcType, id } = row
|
||||||
const mes = JSON.parse(row.mes)
|
const mes = JSON.parse(row.mes)
|
||||||
@@ -251,6 +250,17 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
break
|
break
|
||||||
|
// 征求意见流程
|
||||||
|
case '3':
|
||||||
|
this.$router.push({
|
||||||
|
name: 'bzzqyjStep1-1',
|
||||||
|
query: {
|
||||||
|
type: '3',
|
||||||
|
processName: '标准征求意见流程',
|
||||||
|
bpnId: id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
break
|
||||||
case '4':
|
case '4':
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'bzqdfbStep1-1',
|
name: 'bzqdfbStep1-1',
|
||||||
|
|||||||
@@ -96,11 +96,11 @@
|
|||||||
>
|
>
|
||||||
<div class="demo-drawer-content add-demo">
|
<div class="demo-drawer-content add-demo">
|
||||||
<div class="search-area">
|
<div class="search-area">
|
||||||
<el-form :model="opinionContent" class="label-input-form">
|
<el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
|
||||||
<el-form-item label="章节编号" label-width="80px" class="add-form-item">
|
<el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item">
|
||||||
<el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
|
<el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="修改意见内容(包括理由或依据)" label-width="" class="add-form-item">
|
<el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item">
|
||||||
<el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
|
<el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -132,6 +132,14 @@ export default {
|
|||||||
partCode: '',
|
partCode: '',
|
||||||
content: '',
|
content: '',
|
||||||
},
|
},
|
||||||
|
opinionContentRules: {
|
||||||
|
partCode: [
|
||||||
|
{ required: true, message: '请输入章节编号', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
content: [
|
||||||
|
{ required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
},
|
||||||
standinfoList: [], // 详情列表
|
standinfoList: [], // 详情列表
|
||||||
form: {
|
form: {
|
||||||
cid: this.$route.query.item.cid,
|
cid: this.$route.query.item.cid,
|
||||||
@@ -228,32 +236,36 @@ export default {
|
|||||||
},
|
},
|
||||||
//点击抽屉按钮提交事件
|
//点击抽屉按钮提交事件
|
||||||
saveUserInfo() {
|
saveUserInfo() {
|
||||||
var url = ''
|
this.$refs['formAdd'].validate((valid) => {
|
||||||
var form = {
|
if (valid) {
|
||||||
cid: this.$route.query.item.cid,
|
var url = ''
|
||||||
content: this.opinionContent.content,
|
var form = {
|
||||||
partCode: this.opinionContent.partCode,
|
cid: this.$route.query.item.cid,
|
||||||
userId: this.$store.getters.userInfo.userId,
|
content: this.opinionContent.content,
|
||||||
userName: this.$store.getters.userInfo.account,
|
partCode: this.opinionContent.partCode,
|
||||||
deptName: this.$store.getters.userInfo.orgName,
|
userId: this.$store.getters.userInfo.userId,
|
||||||
deptId: this.$store.getters.userInfo.orgId
|
userName: this.$store.getters.userInfo.account,
|
||||||
}
|
deptName: this.$store.getters.userInfo.orgName,
|
||||||
if (this.type === 'edit') {
|
deptId: this.$store.getters.userInfo.orgId
|
||||||
form.id = this.id
|
}
|
||||||
form.autUserId = this.$store.getters.userInfo.userId
|
if (this.type === 'edit') {
|
||||||
url = 'slrs/sar-public-idea-all/updateStand'
|
form.id = this.id
|
||||||
} else {
|
form.autUserId = this.$store.getters.userInfo.userId
|
||||||
url = 'slrs/sar-public-idea-all/insetStand'
|
url = 'slrs/sar-public-idea-all/updateStand'
|
||||||
}
|
} else {
|
||||||
this.$http.post(url, form, {
|
url = 'slrs/sar-public-idea-all/insetStand'
|
||||||
_this: this
|
}
|
||||||
}, res => {
|
this.$http.post(url, form, {
|
||||||
if (res.respCode === '200') {
|
_this: this
|
||||||
this.form.page = 1
|
}, res => {
|
||||||
this.getList()
|
if (res.respCode === '200') {
|
||||||
}
|
this.form.page = 1
|
||||||
|
this.getList()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.isDialog = false
|
||||||
|
}
|
||||||
})
|
})
|
||||||
this.isDialog = false
|
|
||||||
},
|
},
|
||||||
//点击抽屉按钮取消事件
|
//点击抽屉按钮取消事件
|
||||||
closeDrawer() {
|
closeDrawer() {
|
||||||
|
|||||||
@@ -591,6 +591,15 @@ const routes = [
|
|||||||
title: '标准征求意见流程'
|
title: '标准征求意见流程'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/bzzqyjStep1-1',
|
||||||
|
name: 'bzzqyjStep1-1',
|
||||||
|
component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue'),
|
||||||
|
meta: {
|
||||||
|
requireAuth: true,
|
||||||
|
title: '标准征求意见流程'
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/bzzqyjStep2',
|
path: '/bzzqyjStep2',
|
||||||
name: 'bzzqyjStep2',
|
name: 'bzzqyjStep2',
|
||||||
|
|||||||
Reference in New Issue
Block a user