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

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

Browse Source
This commit is contained in:
zhutianqi
2021-12-22 18:32:24 +08:00
parent 11dd8ba26a d39140019b
commit 5c352bfed3
34 changed files with 1949 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+1 -1
View File
@@ -215,7 +215,7 @@ export default {
&& this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin'
&& this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin'
&& this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex'
&& this.$route.name !== 'blankPage') {
&& this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) {
this.isBoolean = true
} else {
this.isBoolean = false
src/api/phone.js
+1
View File
@@ -1,5 +1,6 @@
import axios from "@/common/axiosV2";
// 手机端查询人
export function phoneUser(params) {
return axios({
url: "api/sys/user/getUserByPhone",
src/api/process.js
+18 -1
View File
@@ -713,7 +713,7 @@ export function workGroup(data) {
params: data
})
}
//
// 手机端查询token
export function loginMobile(data) {
return axios({
url: 'api/lawss/activiti/loginMobile',
@@ -721,3 +721,20 @@ export function loginMobile(data) {
params: data
})
}
// 日历信息编辑
export function updateMeet(data) {
return axios({
url: '/api/sapMeetInfo/updateMeeting',
method: 'post',
params: data
})
}
export function upFile(data) {
return axios({
url: '/api/att/attFile/upload',
method: 'post',
data
})
}
src/main.js
+86 -57
View File
@@ -106,30 +106,41 @@ router.beforeEach(function (to, from, next) {
}
// 返回值为登录状态
/** 判断是不是在手机端操作 */
debugger
if (isMobile()) {
if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){
sessionStorage.removeItem("param");
sessionStorage.setItem('param',JSON.stringify(param4))
next('/phoneIndex')
}else {
next()
}
} else {
if (toName.slice(0,5) !== 'phone') {
let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
'&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
next({path: phoneRouter + '?' + paramPhone})
}else {
if(toName !== 'blankPage'){
if(to.matched.length == 0){
if(toName === 'processCenter'){
window.location.href="about:blank";
window.close();
}else {
if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){
sessionStorage.removeItem("param");
sessionStorage.setItem('param',JSON.stringify(param4))
next('/phoneIndex')
}else {
next()
}
} else {
if (toName.slice(0,5) !== 'phone') {
if(toName === 'LoginVerify'){
next('/blankPage')
}else {
if(toName === 'blankPage' || toName === 'processedPage') {
next()
}else {
extractedVerify()
}
}
}else {
if(toName !== 'blankPage'){
if(to.matched.length === 0){
next('/blankPage')
}else {
next()
}
}else {
next()
}
}else {
next()
}
}
}
@@ -174,48 +185,54 @@ router.beforeEach(function (to, from, next) {
let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成
// 根据type判断跳转具体流程页面
if (prcType === '1') {
// 标准入库流程数据
extracted("bzrkStep5");
} else if (prcType === '4') {
//标准清单发布流程数据
extracted("bzqdfbStep1-4");
} else if (prcType === '5') {
//标准项目合规评估 标准维度
if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
extracted("xmpgStep1-2");
} else {
extracted("xmpgStep1-7");
if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
if(isMobile()){
next('/processedPage')
}else {
// 根据type判断跳转具体流程页面
if (prcType === '1') {
// 标准入库流程数据
extracted("bzrkStep5");
} else if (prcType === '4') {
//标准清单发布流程数据
extracted("bzqdfbStep1-4");
} else if (prcType === '5') {
//标准项目合规评估 标准维度
if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
extracted("xmpgStep1-2");
} else {
extracted("xmpgStep1-7");
}
} else if (prcType === '6') {
//标准项目合规评估 项目维度
if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
extracted("xmpg2Step1-2");
} else {
extracted("xmpg2Step1-12");
}
} else if (prcType === '8') {
// 未符合项整改
extracted("wfhxzgStep5-1");
} else if (prcType === '9') {
extracted("bzjdStep1-6");
//标准调研流程
} else if (prcType === '2') {
extracted("bzdyStep1-9");
} else if (prcType === '3') {
//标准征求意见
extracted("bzzqyjStep1-9");
} else if (prcType === '10') {
//项目清单确认
extracted("xmqdqrStep1-3");
}
}
} else if (prcType === '6') {
//标准项目合规评估 项目维度
if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
extracted("xmpg2Step1-2");
} else {
extracted("xmpg2Step1-12");
}
} else if (prcType === '8') {
// 未符合项整改
extracted("wfhxzgStep5-1");
} else if (prcType === '9') {
extracted("bzjdStep1-6");
//标准调研流程
} else if (prcType === '2') {
extracted("bzdyStep1-9");
} else if (prcType === '3') {
//标准征求意见
extracted("bzzqyjStep1-9");
} else if (prcType === '10') {
//项目清单确认
extracted("xmqdqrStep1-3");
}
} else { // 业务系统 当前节点未完成
// commitStatus 大于0 表示当前节点存在未完成干活流程
// isNotFinished OA 系统显示接受任务 已置为已办
if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
if (prcType === '3') {
if(isMobile()) {
extractedIphone()
}else if (prcType === '3') {
//标准征求意见 接受节点 未完成 oa已办 跳转详情页面
if (path === '/bzzqyjStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
@@ -246,7 +263,12 @@ router.beforeEach(function (to, from, next) {
}
}
} else {
extracted3()
if(isMobile()) {
extractedIphone()
}else{
extracted3()
}
}
}
function extracted(routerPath) {
@@ -268,6 +290,13 @@ router.beforeEach(function (to, from, next) {
next()
}
}
function extractedIphone() {
let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
'&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
next({path: phoneRouter + '?' + paramPhone})
}
function extracted2(routerPath,param2) {
if (token === null || token === '') {
extractedLocalStorage(routerPath,param2);
src/pages/blankPage/index.vue
+7 -2
View File
@@ -2,7 +2,7 @@
<div class="blankPage">
<van-icon name="clear" color="#dabb27" size="70"/>
<div style="font-size: 15px;margin-top: 20px;color: #8c939d">当前任务不支持手机端处理</div>
<el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="$router.go(-1)">返回</el-button>
<el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="closeWindow()">返回</el-button>
</div>
</template>
@@ -16,7 +16,12 @@ export default {
data() {
return {}
},
methods: {}
methods: {
closeWindow(){
window.location.href="about:blank";
window.close();
}
}
}
</script>
src/pages/details/otherStandardDetails/index.vue
+245 -8
View File
@@ -656,6 +656,12 @@
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
>关联条款
</el-button>
<el-button
size="mini"
type="primary"
class="common-button-primary"
@click="editResolveList"
>编辑</el-button>
</div>
<div class="content">
<el-table
@@ -668,13 +674,14 @@
:height="tableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@select="select"
@selection-change="selectAllStand">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- fixed="left"-->
<!-- width="60"-->
<!-- >-->
<!-- </el-table-column>-->
<el-table-column
type="selection"
fixed="left"
width="60"
>
</el-table-column>
<el-table-column
sortable="custom"
show-overflow-tooltip
@@ -796,6 +803,168 @@
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer>
<!-- 编辑分解单的条款-->
<el-drawer
title="编辑"
:visible.sync="editResolveListShowflag"
class="label-input-form"
:before-close="resetEditResolveListForm"
size="800px"
:wrapperClosable="false"
>
<el-form :model="resolveListForm" ref="resolveListForm">
<el-input
v-show="false"
v-model="resolveListForm.id"
/>
<el-form-item
label="条款号"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.itemsNum"
disabled
/>
</el-form-item>
<el-form-item
label="条款名称"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.itemsName"
disabled
/>
</el-form-item>
<el-form-item
label="条款内容"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.termsConditions"
disabled
/>
</el-form-item>
<el-form-item
label="核心技术要求/变化点"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.readContent"
clearable
/>
</el-form-item>
<el-form-item
label="基于上一版本差异"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.comparedWithPrevious"
clearable
/>
</el-form-item>
<el-form-item
label="新车型实施日期(文本)"
class="add-form-item"
>
<el-date-picker
type="dates"
value-format="yyyy-MM-dd"
style="width: 45%"
v-model="resolveListForm.xccssrq"
placeholder="选择一个或多个日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.xccssrq"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="在产车实施日期(文本)"
class="add-form-item"
>
<el-date-picker
type="dates"
value-format="yyyy-MM-dd"
style="width: 45%"
v-model="resolveListForm.zccssrq"
placeholder="选择一个或多个日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.zccssrq"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="适用车型"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.applyArctic"
clearable
/>
</el-form-item>
<el-form-item
label="责任工程师"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.dutyEngineer"
clearable
/>
</el-form-item>
<el-form-item
label="符合性状态"
class="add-form-item"
>
<template>
<el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
<el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
</template>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model="resolveListForm.complianceRequire"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="合规性分析"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.complianceState"
clearable
/>
</el-form-item>
</el-form>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
:loading="editLoading"
icon="el-icon-check"
@click="saveEditInfo"
>提交</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="resetEditResolveListForm"
>取消</el-button
>
</div>
</el-drawer>
<!--新增标准条款-->
<el-drawer
:title="itemModalTitle"
@@ -1597,6 +1766,22 @@ export default {
BZFGGXOUIUJ: [], // 企标覆盖关系
itemModalTitle: '',
modalItemaddShowflag: false,
editResolveListShowflag: false,
resolveListForm:{
id:'',
itemsNum:'',
itemsName:'',
termsConditions:'',
readContent:'',
comparedWithPrevious:'',
xccssrq:'',
zccssrq:'',
applyArctic:'',
dutyEngineer:'',
complianceRequire:'',
complianceState:'',
},
editLoading:false,
itemAddOrUPdateFlag: '',
itemFormdisableflag: false, // 查看标准条款不可编辑
recommendList: [],
@@ -2312,12 +2497,54 @@ export default {
})
this.modalItemaddShowflag = false
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.multipleTable.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return
this.$refs.multipleTable.toggleRowSelection(row, true)
},
selectAllStand(alldata) {
this.selectedItemList = []
for (let i = 0; i < alldata.length; i++) {
this.selectedItemList.push(alldata[i].id)
this.selectedItemList.push(alldata[alldata.length - 1])
console.log('2333',this.selectedItemList)
},
editResolveList(){
console.log('2337',this.selectedItemList)
if (this.selectedItemList.length>0){
this.editResolveListShowflag = true
let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
this.resolveListForm = editItem
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
}else {
this.$message.warning('请选择一条数据')
}
},
saveEditInfo(){
console.log('2530',this.resolveListForm)
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
this.$http.putData(
'SarStandItems/sar-stand-items/updateSarItemAndInterpretation',
this.resolveListForm,
{
_this: this,
},
(res) => {
console.log(res)
if (res.ok){
this.$message.success('修改成功')
this.resetEditResolveListForm()
this.showItemsModel()
}
}
)
},
resetEditResolveListForm(){
this.editResolveListShowflag = false
},
// 分页点击后方法
pageChange(page) {
this.standItemSearch.page = page
@@ -3298,6 +3525,16 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/.el-icon-circle-close:before{
margin-left: 300px;
}
/deep/.label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 650px;
margin-left: 20px;
}
/deep/.label-input-form .add-form-item .el-form-item__label{
width: 150px;
}
/deep/.el-collapse-item__header {
border-bottom: none !important;
}
src/pages/localTool/standCalendar/index.vue
+516 -39
View File
@@ -17,8 +17,8 @@
</el-select>
</span>
</div>
<div style="float: right;display: inline;height: 30px;">
<el-button size="mini" @click="today">今天</el-button>
<div style="float: right;display: inline;height: 30px;padding-right: 5px">
<el-button size="mini" type="primary" plain @click="today">今天</el-button>
</div>
</div>
<el-calendar v-model="value">
@@ -61,41 +61,228 @@
<el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
<el-tag v-else type="warning" size="mini">会议</el-tag>
</span>
<span style="float: right;padding-right: 5px">
<el-button type="primary" size="mini" plain @click="edit_meeting(item)">编辑会议内容</el-button>
</span>
<i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
<div class="content_text">
<span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} </span>
</div>
<div class="content_text">
<span>参与人 : {{ item.partPeople.join('、') }} </span>
</div>
<div class="content_text2">
<span>会议内容 : {{ item.content }}</span>
</div>
<div class="content_text2">
<span>会议地点 : {{ item.place }}</span>
</div>
<div class="content_text">
<div class="content_style">
<div class="content_text">
<span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} </span>
</div>
<div class="content_text">
<span>参与人 : {{ item.partPeople.join('、') }} </span>
</div>
<div class="content_text2">
<span>会议内容 : {{ item.content }}</span>
</div>
<div class="content_text2">
<span>会议地点 : {{ item.place }}</span>
</div>
<div class="content_text">
<span>会议附件 :
<span v-if="item.files.length === 0">{{ '-' }}</span>
<span v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
<div v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;margin-left: 55px;margin-top: -25px;line-height: 35px" @click="previews(res.id)">
<a v-if="res.name.length > 30" style="cursor: pointer">
{{ res.name.slice(0, 30) + '...' }} {{ ';' }}
</a>
<a v-else style="cursor: pointer">
{{ res.name }} {{ ';' }}
</a>
</span>
</div>
</span>
</div>
</div>
</el-card>
</el-card>
</el-col>
</el-row>
<!-- 会议编辑抽屉 -->
<el-drawer
title="编辑人员信息"
:visible.sync="meetFlag"
size="600px"
>
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
<el-form-item class="add-form-item" label="会议标题:">
<el-input v-model="editMeetForm.title" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="参与人员:">
<div class="myPart_btn">
<el-button
type="primary"
size="small"
@click="add_partForm">
新增
</el-button>
<el-button
type="danger"
size="small"
@click="del_partForm">
批量删除
</el-button>
</div>
<el-table
:data="editMeetForm.attend"
border
ref="entryTable"
@selection-change="selectedDelete"
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"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="fillPeople" align="center" label="人员">
<template slot-scope="scope">
{{ scope.row.fillPeople || '' }}
</template>
</el-table-column>
<el-table-column prop="fillUnit" align="center" label="单位">
<template slot-scope="scope">
{{ scope.row.fillUnit || '' }}
</template>
</el-table-column>
<el-table-column prop="fillDept" align="center" label="部门">
<template slot-scope="scope">
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillTel" align="center" label="电话">
<template slot-scope="scope">
{{ scope.row.fillTel || '' }}
</template>
</el-table-column>
<el-table-column prop="fillMail" align="center" label="邮箱">
<template slot-scope="scope">
{{ scope.row.fillMail || '' }}
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="editMeetForm.date"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
</el-date-picker>
</el-form-item>
<el-form-item class="add-form-item" label="会议内容:">
<div class="table_btn">
<el-button type="primary" size="small" @click="meeting_add">添加</el-button>
<el-button type="danger" size="small" @click="meeting_delete">批量删除</el-button>
</div>
<el-table
class="meeting_table"
:data="editMeetForm.contents"
border
ref="entryTable"
style="width: 100%"
@selection-change="selectedTable"
: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="序号" width="50" align="center"/>
<el-table-column
label="议题"
align="center"
prop="meetingTheme">
<template slot-scope="scope">
<el-input v-model="scope.row.meetingTheme"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item class="add-form-item" label="会议地点:">
<el-input v-model="editMeetForm.place" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="会议附件:">
<el-upload
multiple
ref="uploadFile"
:action="actionPath"
name="file"
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button type="primary" size="small">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
<el-button type="primary" :loading="loading" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<el-drawer
title="编辑人员信息"
:visible.sync="editFlag"
size="500px"
:before-close="falseDrawerTab"
custom-class="demo-drawer"
>
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawerTab">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawerTab">确认</el-button>
</div>
</el-drawer>
<Role-tree
check-box
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import {meetingByMonth} from '@/api/unqualProcess.js'
import {updateMeet} from '@/api/process.js'
export default {
name: "calendar",
@@ -122,6 +309,29 @@ export default {
value: new Date(),
// 当前时间
nowDate: '',
meetFlag: false,
editMeetForm: {},
reData: [],
actionPath: 'api/att/attFile/upload',
roleShowflag: false,
nodeList: [],
deleteDataList: [],
upDialog: false,
reDataTable: [],
editFlag: false,
content: [],
editForm: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillTel: '',
fillMail: '',
},
// 议题选中时储存数组
deleteTable: [],
loading: false
}
},
mounted() {
@@ -285,7 +495,268 @@ export default {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
}
},
/** 每个会议对应的编辑按钮 */
edit_meeting(item) {
this.editMeetForm.contents = []
console.log(item)
localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item
this.reData = item.files
this.editMeetForm = item
this.editMeetForm.contents
this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') {
this.editMeetForm.content.split(';').forEach(item => {
this.editMeetForm.contents.push({
meetingTheme: item
})
})
}
this.meetFlag = true
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.reData !== undefined) {
this.newDataList = this.reData
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
}
this.fileListData.files = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.newDataList = []
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' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或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.reData.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.reData.splice(index, 1)
}
})
this.fileListData.files = this.reData
},
add_partForm() {
var list = {
fillPeople: this.fillPeople,
fillUnit: this.fillUnit,
fillDept: this.fillDept,
fillPost: this.fillPost,
fillTel: this.fillTel,
fillMail: this.fillMail,
fillFile: this.fillFile = []
}
this.editMeetForm.attend.push(list)
},
// 编辑按钮
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row
this.editFlag = true
},
selectedDelete(val) {
this.deleteDataList = val
},
/** 批量删除 */
del_partForm() {
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.editMeetForm.attend.findIndex(items => {
return items === item;
});
if (index > -1) {
this.editMeetForm.attend.splice(index, 1);
}
exits.push(item);
});
this.deleteDataList = [];
}).catch(() => {
});
}
},
// 编辑框选人
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if (data.length > 0) {
this.editForm.fillPeopleId = data[0].id
this.editForm.fillPeople = data[0].name
}
this.roleShowflag = false
},
// 编辑框确认按钮
OkDrawerTab() {
this.editFlag = false
},
falseDrawerTab() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editFlag = false
},
selectedTable(val) {
this.deleteTable = val
},
// 编辑框内议题相关
meeting_add() {
var list = {
meetingTheme: this.meetingTheme,
}
this.editMeetForm.contents.push(list)
},
meeting_delete() {
if (this.deleteTable.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteTable.map(item => {
let index
index = this.content.findIndex(items => {
return items === item
})
if (index > -1) {
this.content.splice(index, 1)
}
exits.push(item)
})
this.deleteTable = []
}).catch(() => {
})
}
},
falseDrawer() {
let Items = JSON.parse(localStorage.getItem('objs'))
this.editMeetForm.attend = Items.attend
this.editMeetForm.content = Items.content
this.editMeetForm.date = Items.date
this.editMeetForm.files = Items.files
this.editMeetForm.id = Items.id
this.editMeetForm.partPeople = Items.partPeople
this.editMeetForm.place = Items.place
this.editMeetForm.title = Items.title
this.editMeetForm.type = Items.type
this.meetFlag = false
},
OkDrawer() {
let contentData = []
if (this.editMeetForm.contents.length > 0) {
this.editMeetForm.contents.forEach(item => {
if (item.meetingTheme.length > 0){
contentData.push(item.meetingTheme)
}
})
}
let editForm = {
attend: JSON.stringify( this.editMeetForm.attend),
content: contentData.join(';'),
id: this.editMeetForm.id,
date: this.editMeetForm.date,
title: this.editMeetForm.title,
type: 1,
files: JSON.stringify(this.editMeetForm.files),
place: this.editMeetForm.place
}
this.loading = true
updateMeet(editForm).then(res=>{
if (true) {
this.$message.success("编辑成功");
this.meetFlag = false
this.loading = false
/** 获取当前日期*/
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
if (mm < 10) {
mm = this.padding0(mm, 2)
}
if (dd < 10) {
dd = this.padding0(dd, 2)
}
this.nowDate = yy + '-' + mm + '-' + dd
this.formData.year = yy + '年'
this.formData.month = mm + '月'
this.lastYear = yy
this.lastMonth = mm
this.getMonthData()
this.init()
} else {
this.$message.warning("编辑失败");
this.loading = false
}
})
},
}
}
</script>
@@ -343,7 +814,7 @@ export default {
}
/deep/ .el-card__body {
padding: 10px;
padding: 5px 0px 10px 10px;
}
.card_info_empty {
@@ -354,27 +825,33 @@ export default {
height: 190px;
margin-top: 10px;
.content_text {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
.content_style {
height: 150px;
overflow-y: auto;
width: 100%;
.content_text2 {
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
line-clamp: 4;
-webkit-box-orient: vertical;
line-height: normal;
margin-top: 10px;
font-size: 5px;
.content_text {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
.content_text2 {
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
line-clamp: 4;
-webkit-box-orient: vertical;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
}
}
}
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue
+3 -8
View File
@@ -359,14 +359,9 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue
+3 -8
View File
@@ -359,19 +359,14 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
if (!this.commentText) {
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,
signFlag: '2',
signFlag: "2"
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue
+3 -8
View File
@@ -359,14 +359,9 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+4
View File
@@ -199,6 +199,7 @@
</div>
</div>
<el-table
class="table_info"
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
@@ -593,6 +594,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.wfhxzgStep1 {
/deep/.el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 80px) !important;
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2
View File
@@ -262,6 +262,8 @@ export default {
this.$nextTick(() => {
if (item.passInfo !== 0) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
this.dataList = fileData[0].standardInfoList
} else {
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i<fileData.length; i++) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -2
View File
@@ -84,9 +84,8 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div>
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+37 -24
View File
@@ -122,6 +122,9 @@
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -206,6 +209,7 @@
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -223,6 +227,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="modalshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -232,7 +242,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process";
import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default {
name: "phoneBzqdfbStep4",
@@ -244,6 +254,9 @@ export default {
},
data() {
return {
modalshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
nodeList:[],
isTransfer: false,
drawerTitle:'',
@@ -304,26 +317,6 @@ export default {
};
},
methods: {
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
@@ -341,9 +334,29 @@ export default {
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.modalshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue
+125 -116
View File
@@ -10,109 +10,112 @@
<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 style="overflow: auto">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="24">
<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-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>
<el-form
ref="wbbzForm"
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="120px"
>
<el-row :gutter="24">
<el-col :span="24">
<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-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>
</el-form>
</div>
</el-collapse-transition>
<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>
<el-table border
height="100%"
ref="selection"
:data="participantsData"
tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -223,6 +226,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default {
name: "phoneCywbbzzxdStep4",
@@ -270,6 +280,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab
active: "1",
foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
},
computed: {
src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue
+127 -118
View File
@@ -10,109 +10,112 @@
<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 style="overflow: auto">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="24">
<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-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>
<el-form
ref="wbbzForm"
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="120px"
>
<el-row :gutter="24">
<el-col :span="24">
<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-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>
</el-form>
</div>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
</el-form>
</el-collapse-transition>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle>
<template slot="title">参与人信息</template>
</ProcessTitle>
<el-table border
height="100%"
ref="selection"
:data="participantsData"
tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -165,7 +168,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -223,6 +226,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default {
name: "phoneCywbbzzxdStep5",
@@ -270,6 +280,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab
active: "1",
foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else {
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
},
computed: {
src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue
+126 -117
View File
@@ -10,109 +10,112 @@
<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 style="overflow: auto">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="24">
<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-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>
<el-form
ref="wbbzForm"
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="120px"
>
<el-row :gutter="24">
<el-col :span="24">
<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-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>
</el-form>
</div>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
</el-form>
</el-collapse-transition>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle>
<template slot="title">参与人信息</template>
</ProcessTitle>
<el-table border
height="100%"
ref="selection"
:data="participantsData"
tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -223,6 +226,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default {
name: "phoneCywbbzzxdStep6",
@@ -270,6 +280,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab
active: "1",
foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
},
computed: {
src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
+91 -42
View File
@@ -1,6 +1,6 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="phoneGrbzhxhStep3 phoneBox">
<div class="phoneJrbzhxhStep3 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">加入标准化协会备案流程</template>
<template slot="proNode">标准法规工程师审核</template>
@@ -16,7 +16,7 @@
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -198,7 +198,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -215,7 +215,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -273,6 +273,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -299,19 +300,24 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import { Dialog } from 'vant';
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeaderPhone from "../../components/ProcessHeaderPhone";
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "phoneGrbzhxhStep3",
name: "phoneJrbzhxhStep3",
components: {
ProcessHeader,
ProcessTitle,
@@ -320,6 +326,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: "",
//切换tab
active: "1",
foldFormFlag: true,
@@ -329,7 +338,7 @@ export default {
loading: false,
modalshowflag: false,
drawerModal: false,
drawerTitle: '',
drawerTitle: "",
nodeList: [],
fileList:[],
commentText: '',
@@ -478,6 +487,21 @@ export default {
console.log(item);
this.$nextTick(() => {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.wbbzform.comityOptionsOne.forEach(item =>{
if(this.wbbzform.associationName === item.id){
this.wbbzform.associationName = item.name
}
})
this.wbbzform.comityOptionsTwo.forEach(item =>{
if(this.wbbzform.committee === item.id){
this.wbbzform.committee = item.name
}
})
this.wbbzform.comityOptionsOneThree.forEach(item =>{
if(this.wbbzform.workingGroup === item.id){
this.wbbzform.workingGroup = item.name
}
})
this.associationData = item.associationData
this.participantsData = item.participantsData
item.fileName.forEach(itemId => {
@@ -529,21 +553,42 @@ export default {
}
}
},
//流程转办
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
//转办按钮
handleTransfer() {
this.phoneshowflag = true;
this.phoneRoleList = this.roleTransfer;
this.phoneDrawerTitle = "转办处理人";
},
//确认转办
drawerCheck(data) {
this.roleTransfer = data;
this.phoneRoleList = this.roleTransfer;
this.turnLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
if (res.success) {
this.turnLoading = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
} else {
this.$message.warning(res.message);
}
});
this.modalshowflag = false;
},
//流程提交
handleSubmit() {
this.isSubmit = true
this.wbbzform.signFlag = '1',
this.isSubmit = true;
this.wbbzform.signFlag = "1",
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData;
var json = JSON.stringify(this.wbbzform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -561,29 +606,33 @@ export default {
});
},
//流程驳回
beforeBack(){
this.isSubmit = true
this.wbbzform.signFlag = '0',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
beforeBack() {
if (!this.commentText) {
this.$message.warning("请填写审批意见");
} else {
this.isSubmit = true;
this.wbbzform.signFlag = "0",
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData;
var json = JSON.stringify(this.wbbzform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
});
}
},
},
mounted() {
@@ -600,7 +649,7 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneGrbzhxhStep3 {
.phoneJrbzhxhStep3 {
/deep/.van-dialog__content {
min-height: 300px;
padding: 10px;
src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
+41 -10
View File
@@ -1,6 +1,6 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="phoneGrbzhxhStep4 phoneBox">
<div class="phoneJrbzhxhStep4 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">加入标准化协会备案流程</template>
<template slot="proNode">标准法规工程师审核</template>
@@ -16,7 +16,7 @@
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -198,7 +198,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -215,7 +215,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -273,6 +273,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -299,6 +300,12 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -311,7 +318,7 @@ import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
export default {
name: "phoneGrbzhxhStep4",
name: "phoneJrbzhxhStep4",
components: {
ProcessHeader,
ProcessTitle,
@@ -320,6 +327,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab
active: "1",
foldFormFlag: true,
@@ -529,11 +539,32 @@ export default {
}
}
},
//流程转办
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
//流程提交
handleSubmit() {
@@ -600,7 +631,7 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneGrbzhxhStep4 {
.phoneJrbzhxhStep4 {
/deep/.van-dialog__content {
min-height: 300px;
padding: 10px;
src/pages/processCenter/pages/phone/qbfs/step4.vue
+151 -147
View File
@@ -10,130 +10,132 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div>
<el-form
ref="qbfsForm"
:model="qbfsForm"
:rules="formRules"
class="label-input-form"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div style="overflow: auto">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entNumber"
placeholder="请输入企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.cnName"
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.enName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entCategory"
placeholder="请输入企标类别"
clearable
></el-input>
</el-form-item>
<el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replaceNumber"
placeholder="请输入代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态" prop="nextStatus" class="add-form-item ">
<el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replacedNumber"
placeholder="请输入被代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.releaseDate"
placeholder="请输入发布日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.implementDate"
placeholder="请输入实施日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.reviewDate"
placeholder="请输入复审日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.oldFileName }}
<i
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
<el-form-item class="add-form-item ">
</el-form-item>
</el-col>
</el-row>
<el-form
ref="qbfsForm"
:model="qbfsForm"
:rules="formRules"
class="label-input-form"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entNumber"
placeholder="请输入企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.cnName"
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.enName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entCategory"
placeholder="请输入企标类别"
clearable
></el-input>
</el-form-item>
<el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replaceNumber"
placeholder="请输入代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态" prop="nextStatus" class="add-form-item ">
<el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replacedNumber"
placeholder="请输入被代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.releaseDate"
placeholder="请输入发布日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.implementDate"
placeholder="请输入实施日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.reviewDate"
placeholder="请输入复审日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.oldFileName }}
<i
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
<el-form-item class="add-form-item ">
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-form>
</el-collapse-transition>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle>
<template slot="title">审核信息</template>
@@ -141,7 +143,7 @@
<el-table
:data="dataList"
border
height="52%"
height="100%"
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
@@ -180,7 +182,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -248,14 +250,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -277,6 +277,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -419,31 +422,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
src/pages/processCenter/pages/phone/qbfz/step2.vue
+21 -19
View File
@@ -183,14 +183,6 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRoles"
:nodeList="nodeList"
></Role-tree>
<!-- 选择责任人-->
<Role-tree
:is-title="drawerTitle"
@@ -198,6 +190,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -219,6 +217,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
fileList: [],
commentText: '',
@@ -345,31 +346,32 @@ export default {
}, e => {
});
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRoles (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
src/pages/processCenter/pages/phone/qbfz/step5.vue
+25 -23
View File
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
src/pages/processCenter/pages/phone/qbfz/step6.vue
+25 -23
View File
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
src/pages/processCenter/pages/phone/qbfz/step7.vue
+25 -23
View File
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
+21 -19
View File
@@ -249,14 +249,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +276,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +340,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
+21 -26
View File
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
+21 -26
View File
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+21 -26
View File
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
src/pages/processCenter/pages/phone/wbsm/step3.vue
+33 -39
View File
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/phone/wbsm/step4.vue
+33 -39
View File
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/phone/wbsm/step5.vue
+33 -39
View File
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/phone/xmqdqr/step5.vue
+34 -4
View File
@@ -262,6 +262,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -284,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
lawInfoTableLoading: true,
@@ -403,11 +412,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 将文本状态的id与name对应
setMap(data) {
src/pages/processedPage/index.vue
+35
View File
@@ -0,0 +1,35 @@
<template>
<div class="processedPage">
<van-icon name="checked" color="#1fcd24" size="70"/>
<div style="font-size: 15px;margin-top: 20px;color: #8c939d">当前任务已处理</div>
<el-button type="primary" size="small" style="margin-top: 30px;width: 270px;" @click="closeWindow()">返回</el-button>
</div>
</template>
<script>
import Vue from 'vue';
import { Icon } from 'vant';
Vue.use(Icon);
export default {
name: "processedPage",
data() {
return {}
},
methods: {
closeWindow(){
window.location.href="about:blank";
window.close();
}
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.processedPage {
text-align: center;
margin-top: 55%;
}
</style>
src/router/index.js
+13 -4
View File
@@ -23,6 +23,15 @@ const routes = [
title: '手机提示页面',
}
},
{
path: '/processedPage',
name: 'processedPage',
component: resolve => require(['@/pages/processedPage/index.vue'], resolve),
meta: {
requireAuth: true,
title: '手机提示页面',
}
},
{
path: '*',
redirect: '/loginVerify'
@@ -2247,8 +2256,8 @@ const routes = [
}
},
{
path: '/phoneGrbzhxhStep3',
name: 'phoneGrbzhxhStep3',
path: '/phoneJrbzhxhStep3',
name: 'phoneJrbzhxhStep3',
component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'),
meta: {
isBoolean: true,
@@ -2257,8 +2266,8 @@ const routes = [
}
},
{
path: '/phoneGrbzhxhStep4',
name: 'phoneGrbzhxhStep4',
path: '/phoneJrbzhxhStep4',
name: 'phoneJrbzhxhStep4',
component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'),
meta: {
isBoolean: true,