Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -76,6 +76,14 @@ export function processCreateStand (data) {
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function processCreateLaws (data) {
|
||||
return axios({
|
||||
url: '/api/lawss/actSarItemsLaws/processCreateLaws',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 流程3 法规流程入库
|
||||
export function processCreatePG (data) {
|
||||
return axios({
|
||||
|
||||
@@ -33,7 +33,7 @@ export function dicTypeData (data) {
|
||||
}
|
||||
export function StandardsInfoPage (data) {
|
||||
return axios({
|
||||
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
|
||||
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak',
|
||||
method: 'get',
|
||||
params: data
|
||||
})
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
placeholder="请输入关键词"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-button class="primary_button" type="primary" @click="search">搜索</el-button>
|
||||
<el-button type="primary" @click="search">搜索</el-button>
|
||||
<el-button style="margin-left: 5px;" type="primary" @click="seniorSearch">高级搜索</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -74,6 +75,15 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
seniorSearch(){
|
||||
this.$router.push({
|
||||
name: 'AdvancedSearch',
|
||||
params: {
|
||||
selectKey: this.checkState,
|
||||
searchValue: this.checkContent || undefined
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted(){
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
calss="tel_table"
|
||||
class="tel_table"
|
||||
:data="rh_pageData.comityTel"
|
||||
border
|
||||
ref="entryTable"
|
||||
|
||||
@@ -0,0 +1,702 @@
|
||||
<template>
|
||||
<div class="bzhhStep1">
|
||||
<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;">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="标委会:">
|
||||
{{ hh_pageData.comityName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="分标委:">
|
||||
{{ hh_pageData.comityNameOne || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="工作组:">
|
||||
{{ hh_pageData.comityNameGroup || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="参会人:">
|
||||
{{ hh_pageData.partPeople || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="参会时间:">
|
||||
{{ hh_pageData.meetingStartTime || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="会议名称:">
|
||||
{{ hh_pageData.meetingName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item>
|
||||
<div class="table_btn">
|
||||
<el-button type="primary" size="small" @click="table_add">添加</el-button>
|
||||
<el-button type="danger" size="small" @click="table_delete">批量删除</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="hh_pageData.standardTable"
|
||||
border
|
||||
ref="standardTable"
|
||||
height="49%"
|
||||
@selection-change="selectedDelete"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column type="index" label="序号" align="center" width="50"/>
|
||||
<el-table-column prop="standardId" label="标准编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.standardId" placeholder="请填写标准编号"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standardName" label="标准名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.standardName" placeholder="请填写标准名称"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="material" label="资料" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-upload
|
||||
:disabled="acceptShow"
|
||||
multiple
|
||||
ref="uploadFile"
|
||||
:action="actionPath"
|
||||
name="file"
|
||||
:file-list="scope.row.fileTextList"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="handleBeforeUpload"
|
||||
:before-remove="handleBeforeRemove"
|
||||
:on-success="handleOnsuccess"
|
||||
>
|
||||
<el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
|
||||
</el-upload>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<div style="text-align: right">
|
||||
<el-button type="primary" size="small" @click="otherAdd">添加(测试用)</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="hh_pageData.themeTable"
|
||||
border
|
||||
ref="themeTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="index" label="序号" align="center" width="50"/>
|
||||
<el-table-column label="议题" align="center" prop="meetingTheme">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.meetingTheme"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="资料" align="center" prop="meetingFile" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-upload
|
||||
:action="actionPath"
|
||||
:disabled="acceptShow"
|
||||
multiple
|
||||
ref="uploadThemeFile"
|
||||
name="themeFile"
|
||||
:file-list="scope.row.themeFileList"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="beforeUploadTheme"
|
||||
:before-remove="beforeRemoveTheme"
|
||||
:on-success="onsuccessTheme"
|
||||
>
|
||||
<el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
|
||||
</el-upload>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item label="其他资料:" prop="otherFile">
|
||||
<el-upload
|
||||
:action="actionPath"
|
||||
:disabled="acceptShow"
|
||||
multiple
|
||||
style="width: 30%"
|
||||
ref="uploadOtherFile"
|
||||
name="otherFile"
|
||||
:file-list="otherFileList"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="beforeUploadOther"
|
||||
:before-remove="beforeRemoveOther"
|
||||
:on-success="onsuccessOther"
|
||||
>
|
||||
<el-button type="primary" size="small" @click="otherBtn">点击上传</el-button>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<div class="block" style="padding-top: 20px;">
|
||||
<el-timeline>
|
||||
<el-form
|
||||
ref="roleForm"
|
||||
:model="roleForm"
|
||||
:rules="roleFormRules"
|
||||
class="label-input-form">
|
||||
<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" :disabled="true" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="法规工程师" placement="top" :color="roleForm.engineerUserId ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="engineerUser" style="margin-bottom: 0">
|
||||
<h4>法规工程师</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.engineerUser" placeholder="选择法规工程师" @click.native="choiceZRROne('engineerUserId', '选择法规工程师', roleForm.engineerUserId)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
</el-form>
|
||||
</el-timeline>
|
||||
</div>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<Role-tree
|
||||
check-box
|
||||
is-title="选择人员信息"
|
||||
:is-visible.sync="roleShowflagOne"
|
||||
:nodeList="nodeListOne"
|
||||
@checkedRole="drawerCheckOne"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, inboundLiaisonDetail} from '@/api/process.js'
|
||||
export default {
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
name: "bzhhStep1",
|
||||
data() {
|
||||
return {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
actionPath: 'api/att/attFile/upload',
|
||||
active: '1',
|
||||
hh_pageData: {
|
||||
comityName: '',
|
||||
comityNameOne: '',
|
||||
comityNameGroup: '',
|
||||
meetingStartTime: '',
|
||||
meetingName: '',
|
||||
partPeople: '',
|
||||
standardTable: [],
|
||||
themeTable: [],
|
||||
},
|
||||
hh_rules: {},
|
||||
deleteDataList: [],
|
||||
acceptShow: false,
|
||||
|
||||
roleShowflagOne: false,
|
||||
nodeListOne: [],
|
||||
|
||||
// 上传文件储存
|
||||
fileTextList: [],
|
||||
newDataList: [],
|
||||
|
||||
themeFileList: [],
|
||||
newThemeFile: [],
|
||||
|
||||
otherFileList: [],
|
||||
newOtherFile: [],
|
||||
|
||||
roleForm: {
|
||||
startUserName: this.$store.getters.userInfo.userName,
|
||||
startUser: this.$store.getters.userInfo.userId,
|
||||
engineerUserId: '',
|
||||
engineerUser: '',
|
||||
},
|
||||
roleFormRules: {},
|
||||
|
||||
isSubmit: false,
|
||||
saveLoading: false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
// 右上标签页面切换
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
|
||||
getData() {
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
}
|
||||
inboundLiaisonDetail(params).then(res => {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
let commitStatus = res.commitStatus
|
||||
if(commitStatus && commitStatus > 0){
|
||||
this.acceptShow = true
|
||||
this.submitShow = false
|
||||
}else {
|
||||
this.acceptShow = false
|
||||
this.submitShow = true
|
||||
}
|
||||
this.todoId = res.id
|
||||
this.getFormFieldList(processForm)
|
||||
})
|
||||
},
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
let listJSON = JSON.parse(JSON.stringify(item)).hh_pageData
|
||||
})
|
||||
},
|
||||
|
||||
// 添加按钮
|
||||
table_add() {
|
||||
var list = {
|
||||
standardId: this.standardId,
|
||||
standardName: this.standardName,
|
||||
material: this.material,
|
||||
}
|
||||
this.hh_pageData.standardTable.push(list)
|
||||
},
|
||||
selectedDelete(val) {
|
||||
this.deleteDataList = val
|
||||
},
|
||||
// 批量删除按钮
|
||||
table_delete() {
|
||||
if (this.deleteDataList.length < 1) {
|
||||
this.$message.warning("请选择一条数据进行删除");
|
||||
} else {
|
||||
this.$confirm("您确认删除这些数据?", "提示", {
|
||||
confirmButtonText: "确认",
|
||||
confirmButtonClass: "common-button-primary",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
let exits = [];
|
||||
this.deleteDataList.map(item => {
|
||||
let index;
|
||||
index = this.hh_pageData.standardTable.findIndex(items => {
|
||||
return items === item;
|
||||
});
|
||||
if (index > -1) {
|
||||
this.hh_pageData.standardTable.splice(index, 1);
|
||||
}
|
||||
exits.push(item);
|
||||
});
|
||||
this.deleteDataList = [];
|
||||
}).catch(() => {
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
otherAdd() {
|
||||
var list = {
|
||||
meetingTheme: this.meetingTheme,
|
||||
meetingFile: this.meetingFile,
|
||||
}
|
||||
this.hh_pageData.themeTable.push(list)
|
||||
},
|
||||
/** 标准号的表格上传 */
|
||||
// 标准号的表格上传按钮
|
||||
uploadTable(val) {
|
||||
this.fileListData = val
|
||||
},
|
||||
// 文件上传成功
|
||||
handleOnsuccess(res, file, fileList) {
|
||||
if (res.ok) {
|
||||
if (this.fileTextList !== null) {
|
||||
this.newDataList = this.fileTextList
|
||||
this.newDataList.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
} else {
|
||||
this.newDataList.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
}
|
||||
this.fileListData.fileText = this.newDataList
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.message,
|
||||
type: 'success'
|
||||
})
|
||||
this.fileMadel = false
|
||||
}
|
||||
},
|
||||
// 文件上传限制条件
|
||||
handleBeforeUpload(file) {
|
||||
var filename = file.name
|
||||
var index1 = filename.lastIndexOf('.')
|
||||
var index2 = filename.length
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
|
||||
return true
|
||||
} else {
|
||||
this.spinShow = false
|
||||
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
|
||||
return false
|
||||
}
|
||||
// 判断文件上传大小
|
||||
// eslint-disable-next-line no-unreachable
|
||||
if (file.size / 1024 / 1024 <= 200) {
|
||||
return true
|
||||
} else {
|
||||
this.$message.error('文件' + file.name + '大小不超过200M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
// 移除上传的文件
|
||||
handleBeforeRemove(file, fileList) {
|
||||
this.fileData = fileList
|
||||
this.fileTextList.forEach((item, index) => {
|
||||
if (item.name === file.name || item.id === file.id ) {
|
||||
this.fileTextList.splice(index,1)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
/** 议题列表资料上传 */
|
||||
// 议题列表资料上传按钮
|
||||
uploadThemeTable(val) {
|
||||
this.themeDataList = val
|
||||
},
|
||||
// 文件上传成功
|
||||
onsuccessTheme(res, file, fileList) {
|
||||
if (res.ok) {
|
||||
if (this.themeFileList !== null) {
|
||||
this.newThemeFile = this.themeFileList
|
||||
this.newThemeFile.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
} else {
|
||||
this.newThemeFile.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
}
|
||||
this.themeDataList.fileText = this.newThemeFile
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.message,
|
||||
type: 'success'
|
||||
})
|
||||
this.fileMadel = false
|
||||
}
|
||||
},
|
||||
// 文件上传限制条件
|
||||
beforeUploadTheme(file) {
|
||||
var filename = file.name
|
||||
var index1 = filename.lastIndexOf('.')
|
||||
var index2 = filename.length
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
|
||||
return true
|
||||
} else {
|
||||
this.spinShow = false
|
||||
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
|
||||
return false
|
||||
}
|
||||
// 判断文件上传大小
|
||||
// eslint-disable-next-line no-unreachable
|
||||
if (file.size / 1024 / 1024 <= 200) {
|
||||
return true
|
||||
} else {
|
||||
this.$message.error('文件' + file.name + '大小不超过200M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
// 移除上传的文件
|
||||
beforeRemoveTheme(file, fileList) {
|
||||
this.fileData = fileList
|
||||
this.themeFileList.forEach((item, index) => {
|
||||
if (item.name === file.name || item.id === file.id ) {
|
||||
this.themeFileList.splice(index,1)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/** 其他资料上传 */
|
||||
// 其他资料上传按钮
|
||||
otherBtn(val) {
|
||||
this.otherDataList = val
|
||||
},
|
||||
// 文件上传成功
|
||||
onsuccessOther(res, file, fileList) {
|
||||
if (res.ok) {
|
||||
if (this.otherFileList !== null) {
|
||||
this.newOtherFile = this.otherFileList
|
||||
this.newOtherFile.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
} else {
|
||||
this.newOtherFile.push({
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
}
|
||||
this.otherDataList.fileText = this.newOtherFile
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.message,
|
||||
type: 'success'
|
||||
})
|
||||
this.fileMadel = false
|
||||
}
|
||||
},
|
||||
// 文件上传限制条件
|
||||
beforeUploadOther(file) {
|
||||
var filename = file.name
|
||||
var index1 = filename.lastIndexOf('.')
|
||||
var index2 = filename.length
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
|
||||
return true
|
||||
} else {
|
||||
this.spinShow = false
|
||||
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
|
||||
return false
|
||||
}
|
||||
// 判断文件上传大小
|
||||
// eslint-disable-next-line no-unreachable
|
||||
if (file.size / 1024 / 1024 <= 200) {
|
||||
return true
|
||||
} else {
|
||||
this.$message.error('文件' + file.name + '大小不超过200M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
// 移除上传的文件
|
||||
beforeRemoveOther(file, fileList) {
|
||||
this.fileData = fileList
|
||||
this.otherFileList.forEach((item, index) => {
|
||||
if (item.name === file.name || item.id === file.id ) {
|
||||
this.otherFileList.splice(index,1)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/** 法规工程师选择 */
|
||||
choiceZRROne(type, title, id) {
|
||||
this.nodeListOne = []
|
||||
this.nodeListOne.push(id)
|
||||
this.type = type
|
||||
this.drawerTitleOne = title
|
||||
this.roleShowflagOne = true
|
||||
},
|
||||
drawerCheckOne(data) {
|
||||
this.unqualidiedData.forEach(item => {
|
||||
item.engineer = data[0].name
|
||||
item.engineerId = data[0].id
|
||||
})
|
||||
|
||||
this.roleForm.engineerUser = data[0].name
|
||||
this.roleForm.engineerUserId = data[0].id
|
||||
this.roleShowflagOne = false
|
||||
},
|
||||
|
||||
/** 保存按钮*/
|
||||
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', '20')
|
||||
_formData.append('json', JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
hh_pageData: this.hh_pageData
|
||||
}))
|
||||
saveTaskFirst(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
/** 提交按钮*/
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
hh_pageData: this.hh_pageData,
|
||||
director: this.roleForm.engineerUserId,
|
||||
}
|
||||
this.$refs['hh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs['roleForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const paramsInfo = {
|
||||
type: '22'
|
||||
}
|
||||
startProcess(paramsInfo).then(res => {
|
||||
this.taskID = res.data
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskID)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzhhStep1 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.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-center {
|
||||
padding: 10px 0px 10px 10px;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content_form {
|
||||
/deep/ .el-table__body-wrapper {
|
||||
height: auto !important;
|
||||
}
|
||||
/deep/ .el-table th {
|
||||
padding: 0px;
|
||||
}
|
||||
/deep/ .el-input__inner {
|
||||
text-align: center;
|
||||
}
|
||||
.table_btn {
|
||||
text-align: right;;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,374 @@
|
||||
<template>
|
||||
<div class="bzhhStep1">
|
||||
<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 === '3' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="标委会:">
|
||||
{{ hh_pageData.comityName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="分标委:">
|
||||
{{ hh_pageData.comityNameOne || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="工作组:">
|
||||
{{ hh_pageData.comityNameGroup || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="参会人:">
|
||||
{{ hh_pageData.partPeople || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="参会时间:">
|
||||
{{ hh_pageData.meetingStartTime || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="会议名称:">
|
||||
{{ hh_pageData.meetingName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item>
|
||||
<el-table
|
||||
:data="hh_pageData.standardTable"
|
||||
border
|
||||
ref="standardTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column type="index" label="序号" align="center" width="50"/>
|
||||
<el-table-column prop="standardId" label="标准编号" align="center"/>
|
||||
<el-table-column prop="standardName" label="标准名称" align="center"/>
|
||||
<el-table-column prop="material" label="资料" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-upload
|
||||
:action="actionPath"
|
||||
:disabled="acceptShow"
|
||||
multiple
|
||||
ref="uploadFile"
|
||||
name="file"
|
||||
:file-list="fileTextList"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="handleBeforeUpload"
|
||||
:before-remove="handleBeforeRemove"
|
||||
:on-remove="handleONRemove"
|
||||
:on-success="handleOnsuccess"
|
||||
>
|
||||
</el-upload>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-table
|
||||
:data="hh_pageData.themeTable"
|
||||
border
|
||||
ref="themeTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="index" label="序号" align="center" width="50"/>
|
||||
<el-table-column label="议题" align="center" prop="meetingTheme"></el-table-column>
|
||||
<el-table-column label="资料" align="center" prop="meetingFile">
|
||||
<template slot-scope="scope">
|
||||
<el-upload
|
||||
:action="''"
|
||||
name="file"
|
||||
:file-list="scope.row.fileTextList"
|
||||
:on-preview="handleOnPreview(scope.row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item label="其他资料:" prop="otherFile">
|
||||
<el-upload :action="actionPath">
|
||||
<el-button type="primary" size="small" @click="otherBtn">点击上传</el-button>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</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 === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||
export default {
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
name: "bzhhStep1",
|
||||
data() {
|
||||
return {
|
||||
// 上传地址
|
||||
actionPath: 'api/att/attFile/upload',
|
||||
acceptShow: false,
|
||||
active: '1',
|
||||
hh_pageData: {
|
||||
comityName: '',
|
||||
comityNameOne: '',
|
||||
comityNameGroup: '',
|
||||
meetingStartTime: '',
|
||||
meetingName: '',
|
||||
partPeople: '',
|
||||
standardTable: [],
|
||||
themeTable: [],
|
||||
},
|
||||
commentText: '',
|
||||
fileTextList: [],
|
||||
hh_rules: {},
|
||||
detailData: [],
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.processTable()
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
// 右上标签页面切换
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
|
||||
processTable() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
sortWord: this.shunxu ? this.paixu : "",
|
||||
shunxu: this.shunxu
|
||||
}, {
|
||||
loading: "loading",
|
||||
_this: this
|
||||
}, res => {
|
||||
this.detailData = res
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
getData() {
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
}
|
||||
inboundLiaisonDetail(params).then(res => {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
})
|
||||
},
|
||||
getFormFieldList(item) {
|
||||
this.$nextTick(() => {
|
||||
this.hh_pageData = JSON.parse(JSON.stringify(item)).hh_pageData
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
|
||||
// 点击上传的文件进行下载
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzhhStep2 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.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-center {
|
||||
padding: 10px 0px 10px 10px;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content_form {
|
||||
/deep/ .el-table__body-wrapper {
|
||||
height: auto !important;
|
||||
}
|
||||
/deep/ .el-table th {
|
||||
padding: 0px;
|
||||
}
|
||||
/deep/ .el-input__inner {
|
||||
text-align: center;
|
||||
}
|
||||
.table_btn {
|
||||
text-align: right;;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -36,7 +36,7 @@
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
|
||||
@click.native="choiceZRRS">
|
||||
@click.native="choiceZRR('dockUser', '选择责任部门对接人', roleForm.dockUser)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -60,12 +60,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- 多选择责任人-->
|
||||
<Role-tree
|
||||
is-title="选择责任部门对接人"
|
||||
:is-visible.sync="modalshowflag2"
|
||||
@checkedRole="checkedRole2"
|
||||
:nodeList="nodeList2"
|
||||
></Role-tree>
|
||||
<!-- <Role-tree-->
|
||||
<!-- is-title="选择责任部门对接人"-->
|
||||
<!-- :is-visible.sync="modalshowflag2"-->
|
||||
<!-- @checkedRole="checkedRole2"-->
|
||||
<!-- :nodeList="nodeList2"-->
|
||||
<!-- ></Role-tree>-->
|
||||
<Role-tree
|
||||
check-box
|
||||
:is-title="drawerTitle"
|
||||
@@ -132,43 +132,43 @@ export default {
|
||||
this.drawerTitle = title;
|
||||
this.modalshowflag = true;
|
||||
},
|
||||
choiceZRRS() {
|
||||
this.nodeList2 = [];
|
||||
if (this.roleForm.dockUser.length > 0) {
|
||||
this.nodeList2 = this.roleForm.dockUser.split(",");
|
||||
}
|
||||
this.modalshowflag2 = true;
|
||||
},
|
||||
// choiceZRRS() {
|
||||
// this.nodeList2 = [];
|
||||
// if (this.roleForm.dockUser.length > 0) {
|
||||
// this.nodeList2 = this.roleForm.dockUser.split(",");
|
||||
// }
|
||||
// this.modalshowflag2 = true;
|
||||
// },
|
||||
checkedRole(data) {
|
||||
if (this.type === "dockUser") {
|
||||
this.roleForm.dockUser = this.roleRow.id;
|
||||
this.roleForm.dockUserName = this.roleRow.name;
|
||||
this.roleForm.dockUser = data[0].id;
|
||||
this.roleForm.dockUserName = data[0].name;
|
||||
} else if (this.type === "directorUser") {
|
||||
this.roleForm.directorUser = data[0].id;
|
||||
this.roleForm.directorUserName = data[0].name;
|
||||
}
|
||||
this.modalshowflag = false;
|
||||
},
|
||||
checkedRole2(data) {
|
||||
var idList = "";
|
||||
var nameList = "";
|
||||
data.forEach(item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ",";
|
||||
idList += ",";
|
||||
}
|
||||
idList += item.id;
|
||||
nameList += item.name;
|
||||
});
|
||||
this.roleForm.dockUser = idList;
|
||||
this.roleForm.dockUserName = nameList;
|
||||
},
|
||||
// checkedRole2(data) {
|
||||
// var idList = "";
|
||||
// var nameList = "";
|
||||
// data.forEach(item => {
|
||||
// if (nameList.length > 0) {
|
||||
// nameList += ",";
|
||||
// idList += ",";
|
||||
// }
|
||||
// idList += item.id;
|
||||
// nameList += item.name;
|
||||
// });
|
||||
// this.roleForm.dockUser = idList;
|
||||
// this.roleForm.dockUserName = nameList;
|
||||
// },
|
||||
handleSubmit(){
|
||||
var json = this.roleForm
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
|
||||
this.$http.get("lawss/activiti/startProcess", {type: "14"}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.workPeople" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.workPeopleName" placeholder="选择责任工程师"
|
||||
@click.native="choiceZRRS">
|
||||
@click.native="choiceZRR('workPeople', '选择责任工程师', roleForm.workPeople)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -103,6 +103,7 @@
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessTitle from "process/components/ProcessTitle";
|
||||
import ProcessFooter from "process/components/ProcessFooter";
|
||||
import { inboundLiaisonDetail } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "cywbbzzxdStep2",
|
||||
@@ -131,19 +132,44 @@ export default {
|
||||
directorUserName: ""
|
||||
},
|
||||
roleFormRules: {
|
||||
dockUserName: [
|
||||
{required: true, message: "请选择标准化员", trigger: "change"}
|
||||
],
|
||||
workPeopleName: [
|
||||
{required: true, message: '请选择责任工程师', trigger: "change"}
|
||||
],
|
||||
directorUserName: [
|
||||
{required: true, message: "请选择标准法规部部长", trigger: "change"}
|
||||
]
|
||||
// dockUserName: [
|
||||
// {required: true, message: "请选择标准化员", trigger: "change"}
|
||||
// ],
|
||||
// workPeopleName: [
|
||||
// {required: true, message: '请选择责任工程师', trigger: "change"}
|
||||
// ],
|
||||
// directorUserName: [
|
||||
// {required: true, message: "请选择标准法规部部长", trigger: "change"}
|
||||
// ]
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getData();
|
||||
},
|
||||
methods:{
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId
|
||||
}).then(res => {
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
},
|
||||
/**
|
||||
* @description: 动态表单读取
|
||||
*/
|
||||
getFormFieldList(item) {
|
||||
this.$nextTick(() => {
|
||||
this.roleForm = item
|
||||
});
|
||||
},
|
||||
choiceZRR(type, title, id) {
|
||||
this.nodeList = [];
|
||||
this.nodeList.push(id);
|
||||
@@ -186,33 +212,31 @@ export default {
|
||||
this.roleForm.workPeopleName = nameList;
|
||||
},
|
||||
handleSubmit(){
|
||||
var json = this.roleForm
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
}
|
||||
});
|
||||
if(this.roleForm.workPeople !== undefined){
|
||||
var json = this.roleForm
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
}
|
||||
});
|
||||
}else{
|
||||
this.$message.warning('请选择责任工程师')
|
||||
}
|
||||
|
||||
},
|
||||
handleSave(){
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="主持或参与" prop="personnelRole" class="add-form-item ">
|
||||
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
|
||||
<div class="form-select">
|
||||
<el-select v-model="wbbzform.personnelRole" placeholder="请选择主持或参与">
|
||||
<el-select v-model="wbbzform.hostOrTask" placeholder="请选择主持或参与">
|
||||
<el-option
|
||||
v-for="item in associationOptions"
|
||||
:key="item.value"
|
||||
@@ -50,26 +50,27 @@
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="参与人" prop="standNumber" class="add-form-item ">
|
||||
<el-form-item label="参与人" prop="participants" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standNumber"
|
||||
v-model="wbbzform.participants"
|
||||
placeholder="请选择参与人"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准制定机构" prop="standNumber" class="add-form-item ">
|
||||
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standNumber"
|
||||
v-model="wbbzform.standMechanism"
|
||||
placeholder="请选择标准制定机构"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="参与时间" prop="reportingUnit" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="wbbzform.membershipTime"
|
||||
v-model="wbbzform.partakeTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择入会时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
@@ -80,9 +81,9 @@
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准类型" prop="personnelRole" class="add-form-item ">
|
||||
<el-form-item label="标准类型" prop="standType" class="add-form-item ">
|
||||
<div class="form-select">
|
||||
<el-select v-model="wbbzform.personnelRole" placeholder="请选择标准类型">
|
||||
<el-select v-model="wbbzform.standType" placeholder="请选择标准类型">
|
||||
<el-option
|
||||
v-for="item in associationOptions"
|
||||
:key="item.value"
|
||||
@@ -92,9 +93,9 @@
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准制修订" prop="personnelRole" class="add-form-item ">
|
||||
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
|
||||
<div class="form-select">
|
||||
<el-select v-model="wbbzform.personnelRole" placeholder="请选择标准制修订">
|
||||
<el-select v-model="wbbzform.standRevise" placeholder="请选择标准制修订">
|
||||
<el-option
|
||||
v-for="item in associationOptions"
|
||||
:key="item.value"
|
||||
@@ -104,17 +105,20 @@
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准(拟)发布时间" prop="reportingUnit" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="wbbzform.membershipTime"
|
||||
v-model="wbbzform.releaseTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择标准(拟)发布时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
|
||||
<el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
|
||||
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
|
||||
</el-button>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">项目信息</template>
|
||||
@@ -134,17 +138,17 @@
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="handleSelectionChange1"
|
||||
row-key="id">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column
|
||||
prop="projectNumber"
|
||||
label="项目编号"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.projectNumber"
|
||||
placeholder="请输入项目编号"
|
||||
>
|
||||
</el-input>
|
||||
<el-input
|
||||
v-model="scope.row.projectNumber"
|
||||
placeholder="请输入项目编号"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -256,8 +260,11 @@
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
show-record
|
||||
:recordLoading="recordLoading"
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@record="handleRecord"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
@@ -283,34 +290,44 @@ export default {
|
||||
active: "1",
|
||||
foldFormFlag: true,
|
||||
isSubmit: false,
|
||||
recordLoading: false,
|
||||
saveLoading: false,
|
||||
loading: false,
|
||||
detailData: [], //审批历史信息
|
||||
wbbzform: {
|
||||
reportingUnit:'',
|
||||
associationName: '',
|
||||
committee:'',
|
||||
workingGroup:'',
|
||||
personnelRole:'',
|
||||
membershipTime:'',
|
||||
reportingUnit: "",
|
||||
standNumber: "",
|
||||
hostOrTask: "",
|
||||
participants: "",
|
||||
standMechanism: "",
|
||||
partakeTime: "",
|
||||
standName: "",
|
||||
standType: "",
|
||||
standRevise: "",
|
||||
releaseTime: ""
|
||||
},
|
||||
formRules: {},
|
||||
participantsData: [{
|
||||
projectNumber: '',
|
||||
projectName: '',
|
||||
expenses: '',
|
||||
costBudget:'',
|
||||
}], //参与人表格信息
|
||||
formRules: {
|
||||
reportingUnit: [
|
||||
{ required: true, message: "请输入提报单位", trigger: "change" }
|
||||
]
|
||||
},
|
||||
participantsData: [],
|
||||
// participantsData: [{
|
||||
// projectNumber: '',
|
||||
// projectName: '',
|
||||
// expenses: '',
|
||||
// costBudget:'',
|
||||
// }], //参与人表格信息
|
||||
associationOptions: [{
|
||||
value: '选项1',
|
||||
label: '1'
|
||||
value: "选项1",
|
||||
label: "1"
|
||||
}, {
|
||||
value: '选项2',
|
||||
label: '2'
|
||||
},{
|
||||
value: '选项3',
|
||||
label: '3'
|
||||
}],
|
||||
value: "选项2",
|
||||
label: "2"
|
||||
}, {
|
||||
value: "选项3",
|
||||
label: "3"
|
||||
}]
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
@@ -332,35 +349,73 @@ export default {
|
||||
this.active = type;
|
||||
},
|
||||
foldForm() {
|
||||
this.foldFormFlag = !this.foldFormFlag
|
||||
this.foldFormFlag = !this.foldFormFlag;
|
||||
},
|
||||
handleSave() {
|
||||
},
|
||||
//不备案
|
||||
handleRecord(){
|
||||
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
console.log(this.wbbzform);
|
||||
if (this.participantsData.length < 1) {
|
||||
this.$message.warning("项目信息不能为空");
|
||||
} else {
|
||||
this.participantsData.forEach(item => {
|
||||
if (item.projectNumber === undefined) {
|
||||
this.$message.warning("请完善项目信息");
|
||||
}
|
||||
});
|
||||
this.wbbzform.commentText = this.commentText;
|
||||
let json = {
|
||||
participantsData: this.participantsData,
|
||||
wbbzform: this.wbbzform,
|
||||
dlFlag: '1',
|
||||
};
|
||||
this.$refs["wbbzForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善基础信息");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
//添加按鈕事件
|
||||
addProject(){
|
||||
var list = {
|
||||
projectNumber: this.projectNumber,
|
||||
projectName: this.projectName,
|
||||
expenses: this.expenses,
|
||||
costBudget: this.costBudget
|
||||
}
|
||||
this.participantsData.push(list)
|
||||
addProject() {
|
||||
var list = {
|
||||
projectNumber: this.projectNumber,
|
||||
projectName: this.projectName,
|
||||
expenses: this.expenses,
|
||||
costBudget: this.costBudget
|
||||
};
|
||||
this.participantsData.push(list);
|
||||
},
|
||||
//批量刪除按鈕事件
|
||||
deleteProject(){
|
||||
deleteProject() {
|
||||
|
||||
},
|
||||
handleSelectionChange1(data){
|
||||
handleSelectionChange1(data) {
|
||||
|
||||
},
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -368,15 +423,18 @@ export default {
|
||||
.wbbz-step1 {
|
||||
height: 100%;
|
||||
position: relative;
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.form-select{
|
||||
|
||||
.form-select {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
@@ -392,6 +450,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.headerTabs {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -0,0 +1,477 @@
|
||||
<!-- 参与外部标准制修订流程-->
|
||||
<template>
|
||||
<div class="wbbz-step1">
|
||||
<ProcessHeader>
|
||||
<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 === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div>
|
||||
<el-form
|
||||
ref="wbbzForm"
|
||||
:model="wbbzform"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border" v-if="foldFormFlag">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.reportingUnit"
|
||||
placeholder="请输入提报单位"
|
||||
readonly
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standNumber"
|
||||
readonly
|
||||
placeholder="请输入标准编号"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.hostOrTask"
|
||||
readonly
|
||||
placeholder="请选择主持或参与"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="参与人" prop="participants" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.participants"
|
||||
readonly
|
||||
placeholder="请选择参与人"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standMechanism"
|
||||
placeholder="请选择标准制定机构"
|
||||
readonly
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="wbbzform.partakeTime"
|
||||
readonly
|
||||
placeholder="请选择参与时间"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="standName" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standName"
|
||||
placeholder="请输入标准名称"
|
||||
readonly
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准类型" prop="standType" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standType"
|
||||
readonly
|
||||
placeholder="请选择标准类型"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
|
||||
<el-input
|
||||
v-model="wbbzform.standRevise"
|
||||
readonly
|
||||
placeholder="请选择标准制修订"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="wbbzform.releaseTime"
|
||||
readonly
|
||||
placeholder="请选择标准(拟)发布时间"
|
||||
clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
|
||||
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
|
||||
</el-button>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">项目信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="tableTitle">
|
||||
<div class="tableButton">
|
||||
</div>
|
||||
</div>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="participantsData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column
|
||||
prop="projectNumber"
|
||||
label="项目编号"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.projectNumber"
|
||||
placeholder="请输入项目编号"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="projectName"
|
||||
label="项目名称"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="expenses"
|
||||
label="费用支出项"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.expenses"
|
||||
placeholder="请输入费用支出项"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="costBudget"
|
||||
label="费用预算"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.costBudget"
|
||||
placeholder="请输入费用预算"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
show-record
|
||||
:recordLoading="recordLoading"
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@record="handleRecord"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessTitle from "process/components/ProcessTitle";
|
||||
import ProcessFooter from "process/components/ProcessFooter";
|
||||
import { inboundLiaisonDetail } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "cywbbzzxdStep4",
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessTitle,
|
||||
ProcessFooter
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
//切换tab
|
||||
active: "1",
|
||||
foldFormFlag: true,
|
||||
isSubmit: false,
|
||||
recordLoading: false,
|
||||
saveLoading: false,
|
||||
loading: false,
|
||||
detailData: [], //审批历史信息
|
||||
wbbzform: {
|
||||
reportingUnit: "",
|
||||
standNumber: "",
|
||||
hostOrTask: "",
|
||||
participants: "",
|
||||
standMechanism: "",
|
||||
partakeTime: "",
|
||||
standName: "",
|
||||
standType: "",
|
||||
standRevise: "",
|
||||
releaseTime: ""
|
||||
},
|
||||
formRules: {
|
||||
reportingUnit: [
|
||||
{ required: true, message: "请输入提报单位", trigger: "change" }
|
||||
]
|
||||
},
|
||||
participantsData: [],
|
||||
// participantsData: [{
|
||||
// projectNumber: '',
|
||||
// projectName: '',
|
||||
// expenses: '',
|
||||
// costBudget:'',
|
||||
// }], //参与人表格信息
|
||||
associationOptions: [{
|
||||
value: "选项1",
|
||||
label: "1"
|
||||
}, {
|
||||
value: "选项2",
|
||||
label: "2"
|
||||
}, {
|
||||
value: "选项3",
|
||||
label: "3"
|
||||
}]
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getData();
|
||||
},
|
||||
methods: {
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId
|
||||
}).then(res => {
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
},
|
||||
/**
|
||||
* @description: 动态表单读取
|
||||
*/
|
||||
getFormFieldList(item) {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
});
|
||||
},
|
||||
//审批历史信息
|
||||
processTable() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
sortWord: this.shunxu ? this.paixu : "",
|
||||
shunxu: this.shunxu
|
||||
}, {
|
||||
loading: "loading",
|
||||
_this: this
|
||||
}, res => {
|
||||
this.detailData = res;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
handleTabs(type) {
|
||||
this.active = type;
|
||||
},
|
||||
foldForm() {
|
||||
this.foldFormFlag = !this.foldFormFlag;
|
||||
},
|
||||
handleSave() {
|
||||
},
|
||||
//不备案
|
||||
handleRecord(){
|
||||
|
||||
},
|
||||
handleSubmit() {
|
||||
if (this.participantsData.length < 1) {
|
||||
this.$message.warning("项目信息不能为空");
|
||||
} else {
|
||||
this.participantsData.forEach(item => {
|
||||
if (item.projectNumber === undefined) {
|
||||
this.$message.warning("请完善项目信息");
|
||||
}
|
||||
});
|
||||
this.wbbzform.commentText = this.commentText;
|
||||
let json = {
|
||||
participantsData: this.participantsData,
|
||||
wbbzform: this.wbbzform,
|
||||
dlFlag: '1',
|
||||
};
|
||||
this.$refs["wbbzForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善基础信息");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.wbbz-step1 {
|
||||
height: 100%;
|
||||
position: relative;
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.form-select {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.headerTabs {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
height: 52px;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
@@ -157,8 +157,8 @@ export default {
|
||||
},
|
||||
checkedRole(data) {
|
||||
if (this.type === "dockUser") {
|
||||
this.roleForm.dockUser = this.roleRow.id;
|
||||
this.roleForm.dockUserName = this.roleRow.name;
|
||||
this.roleForm.dockUser = data[0].id;
|
||||
this.roleForm.dockUserName = data[0].name;
|
||||
} else if (this.type === "directorUser") {
|
||||
this.roleForm.directorUser = data[0].id;
|
||||
this.roleForm.directorUserName = data[0].name;
|
||||
|
||||
@@ -634,46 +634,84 @@ export default {
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
if (this.dataList.length < 1) {
|
||||
this.$message.warning("标准不能为空");
|
||||
} else {
|
||||
this.dataList.forEach(item => {
|
||||
if( item.workPeople === ''){
|
||||
this.$message.warning('请选择推荐署名人及单位')
|
||||
}
|
||||
})
|
||||
let json = {
|
||||
commentText: this.commentText,
|
||||
roleForm: this.roleForm,
|
||||
dataList: this.dataList,
|
||||
}
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
if(this.$route.query.prcNum === undefined){
|
||||
if (this.dataList.length < 1) {
|
||||
this.$message.warning("标准不能为空");
|
||||
} else {
|
||||
this.dataList.forEach(item => {
|
||||
if( item.workPeople === ''){
|
||||
this.$message.warning('请选择推荐署名人及单位')
|
||||
}
|
||||
})
|
||||
let json = {
|
||||
commentText: this.commentText,
|
||||
roleForm: this.roleForm,
|
||||
dataList: this.dataList,
|
||||
}
|
||||
});
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
}
|
||||
});
|
||||
}
|
||||
}else{
|
||||
if (this.dataList.length < 1) {
|
||||
this.$message.warning("标准不能为空");
|
||||
} else {
|
||||
this.dataList.forEach(item => {
|
||||
if( item.workPeople === ''){
|
||||
this.$message.warning('请选择推荐署名人及单位')
|
||||
}
|
||||
})
|
||||
let json = {
|
||||
commentText: this.commentText,
|
||||
roleForm: this.roleForm,
|
||||
dataList: this.dataList,
|
||||
}
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
// 流程阶段负责人选择
|
||||
choiceZRR(type, title, id) {
|
||||
|
||||
@@ -603,7 +603,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
|
||||
import {inboundLiaisonDetail,processCreateLaws,changeAssigneeNew} from 'api/process'
|
||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||
|
||||
export default {
|
||||
@@ -1081,6 +1081,7 @@
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
this.processCreateLaws(json)
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
@@ -1095,8 +1096,7 @@
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}else{
|
||||
// ?????????????????????????????/
|
||||
// this.processCreateStand(json)
|
||||
this.processCreateLaws(json)
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -1108,10 +1108,10 @@
|
||||
* @date: 2020-11-18 21:47:58
|
||||
* @auth: chenxiaoxi
|
||||
*/
|
||||
processCreateStand(json) {
|
||||
processCreateLaws(json) {
|
||||
const _formData = new FormData()
|
||||
_formData.append('infoJson', json)
|
||||
processCreateStand(_formData).then(res => {
|
||||
processCreateLaws(_formData).then(res => {
|
||||
if (res.result === '操作成功' || res.data === '入库成功') {
|
||||
this.$message.success(res.data)
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -363,7 +363,7 @@ export default {
|
||||
case 'laws1':
|
||||
// 政策入库流程
|
||||
this.$router.push({
|
||||
name: 'zcrkStep1'
|
||||
name: 'zcrkwStep1'
|
||||
})
|
||||
break
|
||||
case '1':
|
||||
|
||||
@@ -894,6 +894,43 @@ export default {
|
||||
})
|
||||
}
|
||||
break
|
||||
case '14':
|
||||
//参与外部标准制修订信息提报
|
||||
if (row.taskInfo === '下发责任工程师') {
|
||||
this.$router.push({
|
||||
name: 'cywbbzzxdStep2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '填写备案信息'){
|
||||
this.$router.push({
|
||||
name: 'cywbbzzxdStep3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '责任部门对接人审核'){
|
||||
this.$router.push({
|
||||
name: 'cywbbzzxdStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
case '15':
|
||||
//加入标准化协会信息备案流程
|
||||
if (row.taskInfo === '填写入会信息') {
|
||||
@@ -1159,7 +1196,7 @@ export default {
|
||||
})
|
||||
}
|
||||
break
|
||||
// 政策会后流程
|
||||
|
||||
case '21':
|
||||
if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
|
||||
this.$router.push({
|
||||
@@ -1256,6 +1293,18 @@ export default {
|
||||
}
|
||||
|
||||
break
|
||||
case '22':
|
||||
this.$router.push({
|
||||
name: 'bzhhStep2',
|
||||
query:{
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
break
|
||||
}
|
||||
},
|
||||
...mapMutations(['setProcess', 'setHandleInfo']),
|
||||
|
||||
+39
-1
@@ -1177,6 +1177,15 @@ const routes = [
|
||||
title: '参与外部标准制修订信息提报流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/cywbbzzxdStep4',
|
||||
name: 'cywbbzzxdStep4',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '参与外部标准制修订信息提报流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/jrbzhxhStep1',
|
||||
name: 'jrbzhxhStep1',
|
||||
@@ -1324,6 +1333,24 @@ const routes = [
|
||||
title: '外部标准化协会参会流程（审定）'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzhhStep1',
|
||||
name: 'bzhhStep1',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '外部标准化会后管理流程（流程发起）'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzhhStep2',
|
||||
name: 'bzhhStep2',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '外部标准化会后管理流程（审批）'
|
||||
}
|
||||
},
|
||||
]
|
||||
},
|
||||
// 本地工具
|
||||
@@ -2358,7 +2385,7 @@ const routes = [
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/advancedSearch',
|
||||
path: '/advancedSearch/:selectKey?/:searchValue?',
|
||||
name: 'AdvancedSearch',
|
||||
component: () =>
|
||||
import('@/pages/searchCenter/pages/advancedSearch'),
|
||||
@@ -2368,6 +2395,17 @@ const routes = [
|
||||
menuId: 'K9BAYUPZBC'
|
||||
}
|
||||
},
|
||||
// {
|
||||
// path: '/advancedSearch',
|
||||
// name: 'AdvancedSearch',
|
||||
// component: () =>
|
||||
// import('@/pages/searchCenter/pages/advancedSearch'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '高级检索',
|
||||
// menuId: 'K9BAYUPZBC'
|
||||
// }
|
||||
// },
|
||||
{
|
||||
path: '/customReport',
|
||||
name: 'CustomReport',
|
||||
|
||||
Reference in New Issue
Block a user