Merge branch 'fix_foton_20231213' into 'master'

Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!140
This commit is contained in:
高嵩
2023-12-29 10:07:43 +00:00
21 changed files with 36373 additions and 34954 deletions
+71 -33
View File
@@ -1,29 +1,45 @@
<template> <template>
<div> <div>
<!-- 导入模态窗 --> <!-- 导入模态窗 -->
<el-dialog width='400px' <el-dialog
v-if="visible" v-if="visible"
:visible="visible" v-dragDialogWidth
@close="onClose" class="dialog"
title="导入文件" width="400px"
v-dragDialogWidth :visible="visible"
:close-on-click-modal="false" title="导入文件"
append-to-body> :close-on-click-modal="false"
append-to-body
@close="onClose"
>
<el-upload <el-upload
multiple ref="importfile"
drag multiple
:action="action" drag
ref="importfile" :action="action"
:headers="headers" :headers="headers"
name="file" name="file"
:accept="accept" :accept="accept"
:before-upload="beforeUpload" :auto-upload="autoUpload"
:on-success="onSuccess" :before-upload="beforeUpload"
:show-file-list="true" :on-success="onSuccess"
:show-file-list="true"
> >
<i class="el-icon-upload" style="color: #3399ff"></i> <i class="el-icon-upload" style="color: #3399ff" />
<div class="el-upload__text">点击或拖拽上传文件</div> <div class="el-upload__text">点击或拖拽上传文件</div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer">
<slot />
<el-button
v-if="manualUpload"
type="primary"
size="mini"
class="common-button-default"
@click="ManualUpload"
>
提交
</el-button>
</div>
</el-dialog> </el-dialog>
<!-- 导入失败--> <!-- 导入失败-->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px"> <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
@@ -31,10 +47,16 @@
<span>导入失败</span> <span>导入失败</span>
</p> </p>
<div style="max-height: 300px;overflow: auto;padding: 10px 0;"> <div style="max-height: 300px;overflow: auto;padding: 10px 0;">
<p v-html="importForm.content"></p> <p v-html="importForm.content" />
</div> </div>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button type="primary" round class="common-button-default" icon="el-icon-check" @click="importFailed = false"> <el-button
type="primary"
round
class="common-button-default"
icon="el-icon-check"
@click="importFailed = false"
>
确认 确认
</el-button> </el-button>
</div> </div>
@@ -44,16 +66,7 @@
<script> <script>
export default { export default {
name: "import", name: 'Import',
data () {
return {
headers:{
token: JSON.parse(localStorage.getItem('userInfo')).token
},
importFailed: false,
importForm: {}
}
},
props: { props: {
accept: { accept: {
type: String, type: String,
@@ -71,6 +84,25 @@ export default {
type: Number, type: Number,
default: 200 default: 200
}, },
// 是否自动上传
autoUpload: {
type: Boolean,
default: true
},
// 手动上传按钮
manualUpload: {
type: Boolean,
default: false
}
},
data () {
return {
headers: {
token: JSON.parse(localStorage.getItem('userInfo')).token
},
importFailed: false,
importForm: {}
}
}, },
methods: { methods: {
onClose () { onClose () {
@@ -93,13 +125,13 @@ export default {
} }
// 判断文件上传大小 // 判断文件上传大小
if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line
this.$message.error('文件' + file.name + `超过${ this.size }M`) this.$message.error('文件' + file.name + `超过${this.size}M`)
return false return false
} }
return true return true
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
onSuccess(response, file) { onSuccess (response, file) {
if (response.ok) { if (response.ok) {
this.$emit('update:visible', false) this.$emit('update:visible', false)
this.$emit('onSuccess') this.$emit('onSuccess')
@@ -112,6 +144,9 @@ export default {
this.importForm.content = response.message this.importForm.content = response.message
} }
}, },
ManualUpload () {
this.$refs.importfile.submit();
}
} }
} }
</script> </script>
@@ -124,4 +159,7 @@ export default {
width: 100% !important; width: 100% !important;
} }
/deep/ .el-dialog__body {
padding: 10px 20px !important;
}
</style> </style>
@@ -1,25 +1,26 @@
<template> <template>
<el-form-item :label="label" :prop="prop" class="add-form-item form-item-disabled"> <el-form-item :label="label" :prop="prop" class="add-form-item form-item-disabled">
<el-select <el-select
:value="value" :value="value"
:disabled="disabled" :disabled="disabled"
:placeholder="placeholder" :placeholder="placeholder"
:filterable="filterable" :filterable="filterable"
:clearable="clearable" :clearable="clearable"
@change="handleChange"> @change="handleChange"
>
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:value="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
<script> <script>
export default { export default {
name: "SelectFormItem", name: 'SelectFormItem',
props: { props: {
value: { value: {
required: true required: true
@@ -47,9 +48,16 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
customPlaceholder: {
type: String,
default: ''
},
}, },
computed: { computed: {
placeholder () { placeholder () {
if (this.customPlaceholder !== '') {
return this.customPlaceholder
}
return `请选择${this.label}` return `请选择${this.label}`
}, },
}, },
@@ -5,16 +5,23 @@
style="display: none;" style="display: none;"
:value="ids" :value="ids"
clearable clearable
></el-input> />
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="margin-top: 13px" :style="{width: view ? '100%' : '80%'}"> <div style="margin-top: 13px" :style="{width: view ? '100%' : '80%'}">
<template v-if="FileList.length > 0"> <template v-if="FileList.length > 0">
<div v-for="file in FileList" <div
:key="file.id" v-for="file in FileList"
@click="onPreview(file)" :key="file.id"
style="color: #409eff;cursor:pointer" style="color: #409eff;cursor:pointer"
class="fileClass"> class="fileClass"
@click="onPreview(file)"
>
{{ file.name }} {{ file.name }}
<template v-if="down">
<span v-if="file.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="onPreview(file, 'down')" />
</span>
</template>
</div> </div>
</template> </template>
<template v-else> <template v-else>
@@ -22,34 +29,41 @@
</template> </template>
</div> </div>
<div v-if="!view" style="width: 20%;"> <div v-if="!view" style="width: 20%;">
<el-button :disabled="disabled" <el-button
type="primary" :disabled="disabled"
class="common-button-primary" type="primary"
size="mini" class="common-button-primary"
@click="showUpload" size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"> style="margin-left: 10px; margin-top: 11px; float: right;"
<i class="el-icon-upload"></i> @click="showUpload"
>
<i class="el-icon-upload" />
</el-button> </el-button>
</div> </div>
</div> </div>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件" v-dragDialogWidth <el-dialog
:close-on-click-modal="false"> v-dragDialogWidth
width="400px"
:visible.sync="fileMadel"
title="上传文件"
:close-on-click-modal="false"
>
<el-upload <el-upload
multiple ref="importfile"
drag multiple
:file-list="fileList" drag
:action="fileUrl" :file-list="fileList"
ref="importfile" :action="fileUrl"
name="file" name="file"
:accept="accept" :accept="accept"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-success="onSuccess" :on-success="onSuccess"
:on-preview="onPreview" :on-preview="onPreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
:show-file-list="true" :show-file-list="true"
> >
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i> <i class="el-icon-upload" style="color: #3399ff" />
<p>点击或拖拽上传文件</p> <p>点击或拖拽上传文件</p>
</div> </div>
</el-upload> </el-upload>
@@ -59,7 +73,7 @@
<script> <script>
export default { export default {
name: "UploadFormItem", name: 'UploadFormItem',
props: { props: {
ids: { ids: {
required: true, required: true,
@@ -95,28 +109,32 @@ export default {
view: { view: {
type: Boolean, type: Boolean,
default: false default: false
} },
}, down: {
created () { type: Boolean,
this.initFileList() default: false
},
}, },
data () { data () {
return { return {
fileMadel: false, fileMadel: false,
fileList: [],// 用于el-upload fileList: [], // 用于el-upload
FileList: [],// 用于回显 FileList: [], // 用于回显
} }
}, },
created () {
this.initFileList()
},
methods: { methods: {
showUpload () { showUpload () {
this.fileMadel = true; this.fileMadel = true;
}, },
initFileList () { initFileList () {
if (this.ids && this.ids !== '' && this.names && this.names !== '') { if (this.ids && this.ids !== '' && this.names && this.names !== '') {
let fileList = [] const fileList = []
const idArr = this.ids.split(',') const idArr = this.ids.split(',')
const nameArr = this.names.split(',') const nameArr = this.names.split(',')
for (let i = 0 ; i < idArr.length; i++) { for (let i = 0; i < idArr.length; i++) {
fileList.push({ fileList.push({
id: idArr[i], id: idArr[i],
name: nameArr[i] name: nameArr[i]
@@ -142,13 +160,13 @@ export default {
} }
// 判断文件上传大小 // 判断文件上传大小
if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line
this.$message.error('文件' + file.name + `超过${ this.size }M`) this.$message.error('文件' + file.name + `超过${this.size}M`)
return false return false
} }
return true return true
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
onSuccess (response, file,fileList) { onSuccess (response, file, fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据 // 上传成功后判断是否是两条数据是的话替换掉旧数据
if (response.ok) { if (response.ok) {
const fileObj = { const fileObj = {
@@ -175,7 +193,7 @@ export default {
}) })
} }
}, },
removeOneFile(file, fileList) { removeOneFile (file, fileList) {
const ids = fileList.reduce((init, file) => { const ids = fileList.reduce((init, file) => {
if (init === '') { if (init === '') {
return file.id || file.response.data.id return file.id || file.response.data.id
@@ -199,14 +217,22 @@ export default {
this.$emit('update:names', names) this.$emit('update:names', names)
}, },
// 文件预览及下载 // 文件预览及下载
onPreview(file) { onPreview (file, type) {
let attId = "" let attId = ''
if(file && file.id){ if(file && file.id) {
attId = file.id attId = file.id
}else { }else {
attId = file.response.data.id attId = file.response.data.id
} }
this.$preview(attId) if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
}, },
} }
} }
@@ -2,30 +2,34 @@
<div> <div>
<el-form-item :label="label" :prop="prop" class="add-form-item form-item-disabled"> <el-form-item :label="label" :prop="prop" class="add-form-item form-item-disabled">
<el-input <el-input
:value="value" :value="value"
:placeholder="placeholder" :placeholder="placeholder"
:clearable="clearable" :clearable="clearable"
:disabled="disabled" :disabled="disabled"
readonly readonly
@click.native="choice('role', placeholder, value)"> @click.native="choice('role', placeholder, value)"
></el-input> />
</el-form-item> </el-form-item>
<Role-tree <Role-tree
:is-title="choiceTitle" :is-title="choiceTitle"
:is-visible.sync="modalShowRoleFlag" :is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole" :nodeList="nodeList"
:nodeList="nodeList" @checkedRole="checkedRole"
></Role-tree> />
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "personFormItem", name: 'PersonFormItem',
props: { props: {
value: { value: {
required: true required: true
}, },
id: {
type: String,
default: ''
},
prop: { prop: {
type: String type: String
}, },
@@ -57,14 +61,14 @@ export default {
handleChange (event) { handleChange (event) {
this.$emit('input', event) this.$emit('input', event)
}, },
choice(type, title, nameId) { choice (type, title, nameId) {
this.nodeList = [] this.nodeList = []
if (nameId) { if (nameId) {
let nameId1 = nameId.split(',') const nameId1 = nameId.split(',')
let idList = [] let idList = []
nameId1.forEach(item => { nameId1.forEach(item => {
let a, b let a, b
a = item.substring(item.indexOf('(') +1) a = item.substring(item.indexOf('(') + 1)
b = a.substring(0, a.lastIndexOf(')')) b = a.substring(0, a.lastIndexOf(')'))
idList.push(b) idList.push(b)
}) })
@@ -75,7 +79,7 @@ export default {
this.choiceTitle = title this.choiceTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
}, },
checkedRole(data) { checkedRole (data) {
let idList = '' let idList = ''
let nameList = '' let nameList = ''
data.forEach(item => { data.forEach(item => {
@@ -87,12 +91,13 @@ export default {
nameList += item.name nameList += item.name
}) })
this.$emit('input', nameList) this.$emit('input', nameList)
this.$emit('update:id', idList)
this.$emit('change', { this.$emit('change', {
ids: this.unique(data.map(item => item.topUnitId)).join(","), ids: this.unique(data.map(item => item.institutionId)).join(','),
names: this.unique(data.map(item => item.topUnit)).join(",") names: this.unique(data.map(item => item.institutionCascade)).join(',')
}) })
}, },
unique(newArr) { unique (newArr) {
const res = new Map(); const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
}, },
@@ -1,3 +1,4 @@
<!-- eslint-disable -->
<template><div class="bzrkStep1"> <template><div class="bzrkStep1">
<!-- 标准入库流程--> <!-- 标准入库流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
@@ -996,6 +997,7 @@
</template> </template>
<script> <script>
/* eslint-disable */
import { onlyOfficeUrl } from '@/sysConfig' import { onlyOfficeUrl } from '@/sysConfig'
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -4,7 +4,7 @@
<div class="flow-chart"> <div class="flow-chart">
<div class="flow-header"> <div class="flow-header">
<div class="back" title="返回" @click="back"> <div class="back" title="返回" @click="back">
<i class="el-icon-back"></i> <i class="el-icon-back" />
</div> </div>
<!-- <span class="flow-chart-title">{{ $route.params.processNumber }} {{ $route.params.processTypeName }} 流程图</span>--> <!-- <span class="flow-chart-title">{{ $route.params.processNumber }} {{ $route.params.processTypeName }} 流程图</span>-->
</div> </div>
@@ -14,28 +14,37 @@
</div> </div>
<div class="action-bar"> <div class="action-bar">
<el-button <el-button
class="common-button-default export-button" class="common-button-default export-button"
round round
@click="exportStandard" icon="export"
icon="export" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" @click="exportStandard"
>导出</el-button> >
导出
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
round round
@click="seeProcessLast" @click="seeProcessLast"
>查看流程数据</el-button> >
查看流程数据
</el-button>
<el-button <el-button
v-if="tzclrEnable" v-if="tzclrEnable"
class="common-button-default" class="common-button-default"
@click="adjustmentHandler" round
round @click="adjustmentHandler"
>调整处理人</el-button> >
<el-button v-if="approveShow" 调整处理人
class="common-button-default" </el-button>
@click="approveHandler" <el-button
round v-if="approveShow"
>汇总流程</el-button> class="common-button-default"
round
@click="approveHandler"
>
汇总流程
</el-button>
<!--临时屏蔽 start--> <!--临时屏蔽 start-->
<!--<el-button--> <!--<el-button-->
<!-- class="common-button-default"--> <!-- class="common-button-default"-->
@@ -43,75 +52,77 @@
<!-- @click="handlingTasks"--> <!-- @click="handlingTasks"-->
<!--&gt;办理任务</el-button>--> <!--&gt;办理任务</el-button>-->
<!--临时屏蔽 end--> <!--临时屏蔽 end-->
<!-- <el-button--> <!-- <el-button-->
<!-- class="common-button-default"--> <!-- class="common-button-default"-->
<!-- round--> <!-- round-->
<!-- @click="urgeRow"--> <!-- @click="urgeRow"-->
<!-- >催办</el-button>--> <!-- >催办</el-button>-->
</div> </div>
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
height="100%" ref="selection"
ref="selection" height="100%"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
row-key="id" row-key="id"
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@selection-change="tableChange" @selection-change="tableChange"
@sort-change="sortChange" @sort-change="sortChange"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center"
</el-table-column> />
<el-table-column type="index" width="55" label="序号" align="center"/> <el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
align="center" align="center"
sortable="custom" sortable="custom"
/>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
/>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center"
> >
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="endTime"
label="完成时间" label="完成时间"
align="center"> align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="comment" prop="comment"
label="流程信息" label="流程信息"
align="center"> align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.commentText }}</span> <span>{{ scope.row.commentText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completeFlag" prop="completeFlag"
label="状态" label="状态"
align="center"> align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span> <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
</template> </template>
@@ -120,22 +131,22 @@
<loading :loading="loading">流程列表加载中</loading> <loading :loading="loading">流程列表加载中</loading>
<!-- 福田全公司选人解决方案 --> <!-- 福田全公司选人解决方案 -->
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
:is-visible.sync="drawerModal" :is-visible.sync="drawerModal"
@checkedRole="checkedRole" :nodeList="nodeList"
:nodeList="nodeList" @checkedRole="checkedRole"
></Role-tree> />
<!-- <org-table--> <!-- <org-table-->
<!-- title="调整处理人"--> <!-- title="调整处理人"-->
<!-- :visible.sync="drawerModal"--> <!-- :visible.sync="drawerModal"-->
<!-- dialog-model--> <!-- dialog-model-->
<!-- :config="orgTableConfig"--> <!-- :config="orgTableConfig"-->
<!-- :max-selected="1"--> <!-- :max-selected="1"-->
<!-- max-selected-tips="处理人只能选择一个用户"--> <!-- max-selected-tips="处理人只能选择一个用户"-->
<!-- :excludeUser="excludeUser"--> <!-- :excludeUser="excludeUser"-->
<!-- @confirm="addTree"--> <!-- @confirm="addTree"-->
<!-- ></org-table>--> <!-- ></org-table>-->
</div> </div>
</div> </div>
</template> </template>
@@ -147,11 +158,11 @@ import axios from 'axios'
import eventBus from '@/common/eventHub' import eventBus from '@/common/eventHub'
export default { export default {
name: 'processDetail', name: 'ProcessDetail',
data () { data () {
return { return {
approveShow:false, approveShow: false,
approveRowIndex:0, approveRowIndex: 0,
assigneeNewLoading: false, // 调整处理人确定loading assigneeNewLoading: false, // 调整处理人确定loading
loginPeople: '', loginPeople: '',
// 调整处理人抽屉状态 // 调整处理人抽屉状态
@@ -205,24 +216,24 @@ export default {
}) })
}, },
// 汇总流程 // 汇总流程
approveHandler(){ approveHandler () {
let index = this.detailData.length - 1 // 当前流程任务最后一步index const index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true const isEnd = true
let row = {...this.detailData[this.approveRowIndex+1]}//汇总页下一步拿到数据 let row = { ...this.detailData[this.approveRowIndex + 1] }// 汇总页下一步拿到数据
if(this.approveRowIndex ===this.detailData.length-1){ //最后一步 if(this.approveRowIndex === this.detailData.length - 1) { // 最后一步
row = {...this.detailData[this.approveRowIndex]} row = { ...this.detailData[this.approveRowIndex] }
} }
row.taskIds = row.id row.taskIds = row.id
row.taskInfo = row.name row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName row.tabsName = this.$route.query.tabsName
let currentItem = this.detailData[this.approveRowIndex] const currentItem = this.detailData[this.approveRowIndex]
row.currentItem = currentItem row.currentItem = currentItem
let prcType = this.detailData[index].prcType // 流程类型 const prcType = this.detailData[index].prcType // 流程类型
if (isEnd) { if (isEnd) {
if (this.$store.state.detailMap !== '') { if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap) lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap)) this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
} }
@@ -233,88 +244,88 @@ export default {
// 根据type判断跳转具体流程页面 // 根据type判断跳转具体流程页面
if (prcType === '1') { if (prcType === '1') {
// 标准入库流程数据 //第一步 // 标准入库流程数据 //第一步
this.toProcessDetail('bzrkStep1-1',row) this.toProcessDetail('bzrkStep1-1', row)
}else if(prcType === '2'){ }else if(prcType === '2') {
//标准调研流程 //第五步 // 标准调研流程 //第五步
this.toProcessDetail('bzdyStep5-1',row) this.toProcessDetail('bzdyStep5-1', row)
}else if(prcType === '3'){ }else if(prcType === '3') {
//标准征求意见 第七步 // 标准征求意见 第七步
this.toProcessDetail('bzzqyjStep5-1',row) this.toProcessDetail('bzzqyjStep5-1', row)
}else if(prcType === '4'){ }else if(prcType === '4') {
//标准清单发布流程数据 第一步 // 标准清单发布流程数据 第一步
this.toProcessDetail('bzqdfbStep1_1',row) this.toProcessDetail('bzqdfbStep1_1', row)
} else if(prcType === '9') { } else if(prcType === '9') {
//标准解读流程 数据汇总页面 最后一步 暂时没有 // 标准解读流程 数据汇总页面 最后一步 暂时没有
this.toProcessDetail('bzjdStep6-1', row) this.toProcessDetail('bzjdStep6-1', row)
}else if (prcType === '5'){ }else if (prcType === '5') {
//标准合规评估流程 最后一步 // 标准合规评估流程 最后一步
this.toProcessDetail('bzpgStep8-2',row) this.toProcessDetail('bzpgStep8-2', row)
}else if(prcType === '6'){ }else if(prcType === '6') {
//项目合规评估流程 最后一步 // 项目合规评估流程 最后一步
// this.toProcessDetail('xmpg2Step12-1',row) // this.toProcessDetail('xmpg2Step12-1',row)
this.toProcessDetail('xmpgStep5-1',row) this.toProcessDetail('xmpgStep5-1', row)
}else if(prcType === '10'){ }else if(prcType === '10') {
//项目清单确认 最后一步 // 项目清单确认 最后一步
this.toProcessDetail('xmqdqrStep4-1',row) this.toProcessDetail('xmqdqrStep4-1', row)
}else if (prcType === '8') { }else if (prcType === '8') {
// 未符合项整改 3 // 未符合项整改 3
this.toProcessDetail('wfhxzgStep3-1',row) this.toProcessDetail('wfhxzgStep3-1', row)
}else if(prcType === 'buss1'){ }else if(prcType === 'buss1') {
//企标制修订 技术标准 第9 // 企标制修订 技术标准 第9
this.toProcessDetail('bussLibrary11-1',row) this.toProcessDetail('bussLibrary11-1', row)
}else if(prcType === 'buss2'){ }else if(prcType === 'buss2') {
//企标 产品标准 6 // 企标 产品标准 6
this.toProcessDetail('bussLibraryProduct6-1',row) this.toProcessDetail('bussLibraryProduct6-1', row)
}else if(prcType === 'buss3'){ }else if(prcType === 'buss3') {
//企标复审 4 // 企标复审 4
this.toProcessDetail('bussFs2-1',row) this.toProcessDetail('bussFs2-1', row)
}else if(prcType === '24'){ }else if(prcType === '24') {
//企标废止 3 // 企标废止 3
this.toProcessDetail('qbfzStep4-1',row) this.toProcessDetail('qbfzStep4-1', row)
}else if(prcType === '25'){ }else if(prcType === '25') {
//企标制修订计划管控 1 // 企标制修订计划管控 1
this.toProcessDetail('qbzxdjhgkStep1-1',row) this.toProcessDetail('qbzxdjhgkStep1-1', row)
}else if(prcType === '26'){ }else if(prcType === '26') {
//企标制修订计划立项 1 // 企标制修订计划立项 1
this.toProcessDetail('qbzxdlxStep1-1', row) this.toProcessDetail('qbzxdlxStep1-1', row)
} else if (prcType === '33') { } else if (prcType === '33') {
let data = [] const data = []
this.detailData.forEach(res => { this.detailData.forEach(res => {
if (res.taskDefinitionKey == 'PolicySolicitOpinionProcessKey11') { if (res.taskDefinitionKey == 'PolicySolicitOpinionProcessKey11') {
data.push(res) data.push(res)
} }
}) })
this.$router.push({ this.$router.push({
path: '/policyConsultation', path: '/policyConsultation',
query: { query: {
taskIds: data[0].id, taskIds: data[0].id,
prcNum: data[0].prcNum, prcNum: data[0].prcNum,
prcName: data[0].prcName, prcName: data[0].prcName,
prcType: data[0].prcType, prcType: data[0].prcType,
prcId: data[0].processInstanceId, prcId: data[0].processInstanceId,
taskDefinitionKey: data[0].taskDefinitionKey, taskDefinitionKey: data[0].taskDefinitionKey,
operate: 'view', operate: 'view',
} }
}) })
} else if (prcType === '34') { } else if (prcType === '34') {
let data = [] const data = []
this.detailData.forEach(res => { this.detailData.forEach(res => {
if (res.taskDefinitionKey == 'PolicyComplianceProgramReviewProcessKey11') { if (res.taskDefinitionKey == 'PolicyComplianceProgramReviewProcessKey11') {
data.push(res) data.push(res)
} }
}) })
this.$router.push({ this.$router.push({
path: '/policyComplianceReview', path: '/policyComplianceReview',
query: { query: {
taskIds: data[0].id, taskIds: data[0].id,
prcNum: data[0].prcNum, prcNum: data[0].prcNum,
prcName: data[0].prcName, prcName: data[0].prcName,
prcType: data[0].prcType, prcType: data[0].prcType,
prcId: data[0].processInstanceId, prcId: data[0].processInstanceId,
taskDefinitionKey: data[0].taskDefinitionKey, taskDefinitionKey: data[0].taskDefinitionKey,
operate: 'view', operate: 'view',
} }
}) })
} }
} }
}, },
@@ -324,13 +335,13 @@ export default {
* @Description: 查看流程最后一步 * @Description: 查看流程最后一步
*/ */
seeProcessLast () { seeProcessLast () {
let index = this.detailData.length - 1 // 当前流程任务最后一步index const index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true const isEnd = true
let row = {...this.detailData[0]} const row = { ...this.detailData[0] }
row.taskIds = row.id row.taskIds = row.id
row.taskInfo = row.name row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型 const prcType = this.detailData[index].prcType // 流程类型
console.log(prcType); console.log(prcType);
// 判断当前流程是否已全部办理完成 // 判断当前流程是否已全部办理完成
// this.detailData.map(item => { // this.detailData.map(item => {
@@ -340,7 +351,7 @@ export default {
// }) // })
if (isEnd) { if (isEnd) {
if (this.$store.state.detailMap !== '') { if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap) lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap)) this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
} }
@@ -351,133 +362,133 @@ export default {
// 根据type判断跳转具体流程页面 // 根据type判断跳转具体流程页面
if (prcType === '1') { if (prcType === '1') {
// 标准入库流程数据 // 标准入库流程数据
this.toProcessDetail('bzrkStep1',row) this.toProcessDetail('bzrkStep1', row)
}else if(prcType === 'laws1'){ }else if(prcType === 'laws1') {
//政策入库 // 政策入库
// this.toProcessDetail('zcrkStep1',row) // this.toProcessDetail('zcrkStep1',row)
this.toProcessDetailForParams('policyWarehousing1',row) this.toProcessDetailForParams('policyWarehousing1', row)
}else if(prcType === 'laws2'){ }else if(prcType === 'laws2') {
//政策征求意见流程 // 政策征求意见流程
this.toProcessDetail('zczqyjStep1',row) this.toProcessDetail('zczqyjStep1', row)
}else if(prcType === 'laws3'){ }else if(prcType === 'laws3') {
//重点认证标准/政策合规性项目审查流程 // 重点认证标准/政策合规性项目审查流程
this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) this.toProcessDetail('zdrzbzORzchgxxmscStep1', row)
}else if(prcType === 'buss1'){ }else if(prcType === 'buss1') {
//企标入库 // 企标入库
this.toProcessDetail('bussLibrary1',row) this.toProcessDetail('bussLibrary1', row)
}else if(prcType === 'buss2'){ }else if(prcType === 'buss2') {
//企标入库 // 企标入库
this.toProcessDetail('bussLibraryProduct1',row) this.toProcessDetail('bussLibraryProduct1', row)
}else if(prcType === 'buss3'){ }else if(prcType === 'buss3') {
//企标复审 // 企标复审
this.toProcessDetail('qbfsStep1',row) this.toProcessDetail('qbfsStep1', row)
}else if(prcType === '4'){ }else if(prcType === '4') {
//标准清单发布流程数据 // 标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1',row) this.toProcessDetail('bzqdfbStep1', row)
}else if (prcType === '5'){ }else if (prcType === '5') {
//标准项目合规评估 // 标准项目合规评估
this.toProcessDetail('bzpgStep1',row) this.toProcessDetail('bzpgStep1', row)
}else if(prcType === '6'){ }else if(prcType === '6') {
//标准项目合规评估 项目维度 // 标准项目合规评估 项目维度
this.toProcessDetail('xmpg2Step1',row) this.toProcessDetail('xmpg2Step1', row)
} else if (prcType === '8') { } else if (prcType === '8') {
// 未符合项整改 // 未符合项整改
this.toProcessDetail('wfhxzgStep1',row) this.toProcessDetail('wfhxzgStep1', row)
} else if(prcType === '9'){ } else if(prcType === '9') {
this.toProcessDetail('bzjdStep1',row) this.toProcessDetail('bzjdStep1', row)
//标准调研流程 // 标准调研流程
}else if(prcType === '2'){ }else if(prcType === '2') {
this.toProcessDetail('bzdyStep1',row) this.toProcessDetail('bzdyStep1', row)
}else if(prcType === '3'){ }else if(prcType === '3') {
//标准征求意见 // 标准征求意见
this.toProcessDetail('bzzqyjStep1',row) this.toProcessDetail('bzzqyjStep1', row)
}else if(prcType === '10'){ }else if(prcType === '10') {
//项目清单确认 // 项目清单确认
this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt') this.toProcessDetail('xmqdqrStep1', row, 'unShowReceipt')
}else if(prcType === '14'){ }else if(prcType === '14') {
//加入标准化协会信息备案流程 // 加入标准化协会信息备案流程
this.toProcessDetail('cywbbzzxdStep1',row,) this.toProcessDetail('cywbbzzxdStep1', row,)
}else if(prcType === '15'){ }else if(prcType === '15') {
//加入标准化协会信息备案流程 // 加入标准化协会信息备案流程
this.toProcessDetail('jrbzhxhStep1',row,) this.toProcessDetail('jrbzhxhStep1', row,)
} else if(prcType === '16'){ } else if(prcType === '16') {
//外部署名 // 外部署名
this.toProcessDetail('wbsmStep1',row) this.toProcessDetail('wbsmStep1', row)
}else if(prcType === '20') { }else if(prcType === '20') {
// 入会流程 // 入会流程
this.toProcessDetail('bzrhStep1',row) this.toProcessDetail('bzrhStep1', row)
} else if(prcType === '21') { } else if(prcType === '21') {
// 参会流程 // 参会流程
this.toProcessDetail('bzchStep1',row) this.toProcessDetail('bzchStep1', row)
} else if(prcType === '23'){ } else if(prcType === '23') {
//企标复审 // 企标复审
this.toProcessDetail('qbfsStep1',row) this.toProcessDetail('qbfsStep1', row)
}else if(prcType === '24'){ }else if(prcType === '24') {
//企标废止 // 企标废止
this.toProcessDetail('qbfzStep1',row) this.toProcessDetail('qbfzStep1', row)
}else if(prcType === '25'){ }else if(prcType === '25') {
//企标制修订计划管控 // 企标制修订计划管控
this.toProcessDetail('qbzxdjhgkStep1',row) this.toProcessDetail('qbzxdjhgkStep1', row)
}else if(prcType === '26'){ }else if(prcType === '26') {
//企标制修订计划立项 // 企标制修订计划立项
this.toProcessDetail('qbzxdlxStep1',row) this.toProcessDetail('qbzxdlxStep1', row)
}else if(prcType === '17'){ }else if(prcType === '17') {
//政策课题入会发起流程 // 政策课题入会发起流程
this.toProcessDetail('zcrhStep1',row) this.toProcessDetail('zcrhStep1', row)
}else if(prcType === '18'){ }else if(prcType === '18') {
//政策课题参会发起流程 // 政策课题参会发起流程
this.toProcessDetail('zcchStep1',row) this.toProcessDetail('zcchStep1', row)
}else if(prcType === '12'){ }else if(prcType === '12') {
//政策课题参会发起流程 // 政策课题参会发起流程
this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) this.toProcessDetail('zdrzbzORzchgxxmscStep1', row)
}else if(prcType === '29'){ }else if(prcType === '29') {
//内外部会议入库 // 内外部会议入库
// this.toProcessDetail('policyMeetings1',row) // this.toProcessDetail('policyMeetings1',row)
this.toProcessDetailForParams('policyMeetings1',row) this.toProcessDetailForParams('policyMeetings1', row)
} else if(prcType === '30'){ } else if(prcType === '30') {
//政策课题入会流程 // 政策课题入会流程
const params = { type: 'step1' } const params = { type: 'step1' }
this.toProcessDetailForParams('policyTopicEnrollment',row, params) this.toProcessDetailForParams('policyTopicEnrollment', row, params)
} else if(prcType === '31'){ } else if(prcType === '31') {
//政策课题参会流程 // 政策课题参会流程
const params = { type: 'step1' } const params = { type: 'step1' }
this.toProcessDetailForParams('policyTopicParticipation', row, params) this.toProcessDetailForParams('policyTopicParticipation', row, params)
} else if(prcType === '32'){ } else if(prcType === '32') {
// 政策法规资料入库流程 // 政策法规资料入库流程
const params = { type: 'step1' } const params = { type: 'step1' }
this.toProcessDetailForParams('policyRegulatoryMaterials', row, params) this.toProcessDetailForParams('policyRegulatoryMaterials', row, params)
} else if (prcType === '33') { } else if (prcType === '33') {
this.$router.push({ this.$router.push({
path: '/policyConsultation', path: '/policyConsultation',
query: { query: {
taskIds: row.id, taskIds: row.id,
prcNum: row.prcNum, prcNum: row.prcNum,
prcId: row.processInstanceId, prcId: row.processInstanceId,
prcName: row.prcName, prcName: row.prcName,
prcType: row.prcType, prcType: row.prcType,
taskDefinitionKey: row.taskDefinitionKey, taskDefinitionKey: row.taskDefinitionKey,
operate: 'view', operate: 'view',
} }
}) })
} else if (prcType === '34') { } else if (prcType === '34') {
this.$router.push({ this.$router.push({
path: '/policyComplianceReview', path: '/policyComplianceReview',
query: { query: {
taskIds: row.id, taskIds: row.id,
prcNum: row.prcNum, prcNum: row.prcNum,
prcName: row.prcName, prcName: row.prcName,
prcType: row.prcType, prcType: row.prcType,
prcId: row.processInstanceId, prcId: row.processInstanceId,
taskDefinitionKey: row.taskDefinitionKey, taskDefinitionKey: row.taskDefinitionKey,
operate: 'view', operate: 'view',
} }
}) })
} }
} else { } else {
this.$message.warning('当前流程未全部办理完成,无法查看') this.$message.warning('当前流程未全部办理完成,无法查看')
} }
}, },
toProcessDetailForParams (componentName,row, params) { toProcessDetailForParams (componentName, row, params) {
this.$router.push({ this.$router.push({
name: componentName, name: componentName,
query: { query: {
@@ -491,8 +502,8 @@ export default {
params params
}) })
}, },
toProcessDetail(componentName,row,unShowReceipt) { toProcessDetail (componentName, row, unShowReceipt) {
let data = { const data = {
name: componentName, name: componentName,
query: { query: {
bpnId: row.bpnId, bpnId: row.bpnId,
@@ -501,20 +512,20 @@ export default {
prcNum: row.prcNum, prcNum: row.prcNum,
prcName: row.prcName, prcName: row.prcName,
prcType: row.prcType, prcType: row.prcType,
disabledXX:true, disabledXX: true,
verifySarStandard:true, verifySarStandard: true,
index:this.approveRowIndex, index: this.approveRowIndex,
processInstanceId:row.processInstanceId processInstanceId: row.processInstanceId
}, },
params:{ params: {
currentItem:row.currentItem currentItem: row.currentItem
} }
} }
if (unShowReceipt) { if (unShowReceipt) {
data.query.unShowReceipt = true data.query.unShowReceipt = true
} }
let routeUrl =this.$router.resolve(data) const routeUrl = this.$router.resolve(data)
window.open(routeUrl.href, "_blank") window.open(routeUrl.href, '_blank')
// this.$router.push(data) // this.$router.push(data)
}, },
// table行选择事件 // table行选择事件
@@ -526,13 +537,13 @@ export default {
// 判断选中一条数据、未完成数据、当前登陆人数据 // 判断选中一条数据、未完成数据、当前登陆人数据
if (this.tableRow.length === 1 && !this.tableRow[0].endTime && this.tableRow[0].assigneeId === this.$store.getters.userInfo.userId) { if (this.tableRow.length === 1 && !this.tableRow[0].endTime && this.tableRow[0].assigneeId === this.$store.getters.userInfo.userId) {
if (this.$store.state.detailMap !== '') { if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap) lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap)) this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
} }
// this.tableRow[0].processType = this.$route.params.processType // this.tableRow[0].processType = this.$route.params.processType
this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setDetailMap', this.$route.path)
let row = { const row = {
taskIds: this.tableRow[0].id, taskIds: this.tableRow[0].id,
prcId: this.tableRow[0].processDefinitionId, prcId: this.tableRow[0].processDefinitionId,
prcNum: this.tableRow[0].prcNum, prcNum: this.tableRow[0].prcNum,
@@ -544,7 +555,7 @@ export default {
this.setHandleInfo((JSON.stringify(row))) this.setHandleInfo((JSON.stringify(row)))
const prcType = row.prcType const prcType = row.prcType
switch (prcType) { switch (prcType) {
// 法规入库及评估流程 // 法规入库及评估流程
case '1': case '1':
if (row.taskInfo === '法规工程师修改') { if (row.taskInfo === '法规工程师修改') {
this.$router.push({ this.$router.push({
@@ -1068,15 +1079,15 @@ export default {
if (row.taskInfo === '法规联络人发起复审或企标工程师选择法规联络人') { if (row.taskInfo === '法规联络人发起复审或企标工程师选择法规联络人') {
this.$router.push({ this.$router.push({
path: '/qbfs/step1', path: '/qbfs/step1',
query:{ query: {
taskIds:row.taskIds taskIds: row.taskIds
} }
}) })
} else if (row.taskInfo === '选择法规联络人') { } else if (row.taskInfo === '选择法规联络人') {
this.$router.push({ this.$router.push({
path: '/qbfs/step2', path: '/qbfs/step2',
query:{ query: {
taskIds:row.taskIds taskIds: row.taskIds
} }
}) })
} }
@@ -1156,21 +1167,21 @@ export default {
*/ */
urge (row) { urge (row) {
this.$http.postData('person/personMsg/saveNew', this.$http.postData('person/personMsg/saveNew',
{ {
msgContent: '流程编号为' + row.prcNum + '的流程,请尽快办理。', msgContent: '流程编号为' + row.prcNum + '的流程,请尽快办理。',
msgTitle: '流程编号' + row.prcNum, msgTitle: '流程编号' + row.prcNum,
userId: row.assigneeId, userId: row.assigneeId,
msgType: 'TEXT' msgType: 'TEXT'
}, },
{ {
loading: 'loading', loading: 'loading',
_this: this _this: this
}, res => { }, res => {
this.clearanceCondition() this.clearanceCondition()
this.processTable() this.processTable()
this.$message.success('催办成功') this.$message.success('催办成功')
}, e => { }, e => {
}) })
}, },
// 请求转换流程图 // 请求转换流程图
processNum () { processNum () {
@@ -1200,7 +1211,7 @@ export default {
this.detailData = res this.detailData = res
}, e => {}) }, e => {})
}, },
...mapMutations(['setProcess', 'setHandleInfo', 'setPrcLastDetail']), ...mapMutations([ 'setProcess', 'setHandleInfo', 'setPrcLastDetail' ]),
processFlag (res) { processFlag (res) {
// if (res.data.hisTaskExcelVOList[0].processTypeFlag === '1' || res.data.hisTaskExcelVOList[0].processTypeFlag === '2' || res.data.hisTaskExcelVOList[0].processTypeFlag === '3' || res.data.hisTaskExcelVOList[0].processTypeFlag === '4' || // if (res.data.hisTaskExcelVOList[0].processTypeFlag === '1' || res.data.hisTaskExcelVOList[0].processTypeFlag === '2' || res.data.hisTaskExcelVOList[0].processTypeFlag === '3' || res.data.hisTaskExcelVOList[0].processTypeFlag === '4' ||
// res.data.hisTaskExcelVOList[0].processTypeFlag === '5' || res.data.hisTaskExcelVOList[0].processTypeFlag === '6' || res.data.hisTaskExcelVOList[0].processTypeFlag === '8') { // res.data.hisTaskExcelVOList[0].processTypeFlag === '5' || res.data.hisTaskExcelVOList[0].processTypeFlag === '6' || res.data.hisTaskExcelVOList[0].processTypeFlag === '8') {
@@ -1213,7 +1224,7 @@ export default {
}, },
// 导出事件 // 导出事件
exportStandard () { exportStandard () {
let ids = [] const ids = []
if (this.tableRow.length > 0) { if (this.tableRow.length > 0) {
this.tableRow.map(item => { this.tableRow.map(item => {
ids.push(item.id) ids.push(item.id)
@@ -1231,13 +1242,13 @@ export default {
if (sortObj.column.order !== 'normal') { if (sortObj.column.order !== 'normal') {
this.shunxu = '' this.shunxu = ''
this.paixu = '' this.paixu = ''
let order = sortObj.column.order const order = sortObj.column.order
switch (sortObj.column.property) { switch (sortObj.column.property) {
// 任务步骤 // 任务步骤
case 'name' : case 'name' :
// 后台联调 // 后台联调
this.paixu = 'name' this.paixu = 'name'
if (order === 'ascending'){ if (order === 'ascending') {
this.shunxu = 'asc' this.shunxu = 'asc'
} else if (order === 'descending') { } else if (order === 'descending') {
this.shunxu = 'desc' this.shunxu = 'desc'
@@ -1247,7 +1258,7 @@ export default {
case 'assignee' : case 'assignee' :
// 后台联调 // 后台联调
this.paixu = 'assignee' this.paixu = 'assignee'
if (order === 'ascending'){ if (order === 'ascending') {
this.shunxu = 'asc' this.shunxu = 'asc'
} else if (order === 'descending') { } else if (order === 'descending') {
this.shunxu = 'desc' this.shunxu = 'desc'
@@ -1257,7 +1268,7 @@ export default {
case 'createTime' : case 'createTime' :
// 后台联调 // 后台联调
this.paixu = 'startTime' this.paixu = 'startTime'
if (order === 'ascending'){ if (order === 'ascending') {
this.shunxu = 'asc' this.shunxu = 'asc'
} else if (order === 'descending') { } else if (order === 'descending') {
this.shunxu = 'desc' this.shunxu = 'desc'
@@ -1268,17 +1279,17 @@ export default {
this.processTable() this.processTable()
}, },
// 流程审批按钮是否显示 // 流程审批按钮是否显示
getApproveShow(){ getApproveShow () {
this.$http.get('lawss/activiti/get_gather_by_instance',{ this.$http.get('lawss/activiti/get_gather_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu shunxu: this.shunxu
},{ }, {
loading: 'loading', loading: 'loading',
_this: this _this: this
}, res => { }, res => {
this.approveShow = res[res.length-1].isGather this.approveShow = res[res.length - 1].isGather
this.approveRowIndex = res[res.length-1].index this.approveRowIndex = res[res.length - 1].index
}, e => {}) }, e => {})
} }
}, },
@@ -1301,7 +1312,7 @@ export default {
/** /**
* 调整处理人按钮是否显示 * 调整处理人按钮是否显示
*/ */
tzclrEnable() { tzclrEnable () {
return this.$route.query.tabsName === 'MonitorProcess' return this.$route.query.tabsName === 'MonitorProcess'
} }
}, },
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff