yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
2398fe0fc5 ea951ff13a
commit
20deb27b96
4 changed files with 57 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      anrui-reportcenter-ui/src/views/callstatistics/callstatistics.vue
  2. 12
      anrui-system-ui/src/api/flow/todo.js
  3. 4
      anrui-system-ui/src/views/Home/Home.vue
  4. 14
      anrui-system-ui/src/views/flow/doneList.vue

57
anrui-reportcenter-ui/src/views/callstatistics/callstatistics.vue
View File

@ -7,17 +7,20 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="发起时间">
<el-date-picker v-model="listQuery.params.startTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="listQuery.params.endTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.contractId" clearable placeholder=""/>
<el-form-item label="发起人">
<el-input v-model="listQuery.params.applyName" clearable placeholder=""/>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" clearable placeholder=""/>
<el-form-item label="审批用时>">
<el-input v-model="listQuery.params.useTime" clearable placeholder=""/>
</el-form-item>
<el-form-item label="系统催办次数>">
<el-input v-model="listQuery.params.sysCount" clearable placeholder=""/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -34,20 +37,20 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="taskId" label="工作编号" align="center" width="100"/>
<el-table-column prop="taskName" label="工作名称" align="center" />
<el-table-column prop="applyName" label="发起人" align="center" />
<el-table-column prop="startTime" label="发起时间" align="center" />
<el-table-column prop="endTime" label="结束时间" align="center" />
<el-table-column prop="taskName" label="工作名称" align="center" width="150"/>
<el-table-column prop="applyName" label="发起人" align="center" width="100"/>
<el-table-column prop="startTime" label="发起时间" align="center" width="160"/>
<el-table-column prop="endTime" label="结束时间" align="center" width="160"/>
<el-table-column prop="approvalState" label="审批状态" align="center" width="90"/>
<el-table-column prop="result" label="审批结果" align="center" width="90"/>
<el-table-column prop="approvalName" label="审批人" align="center" width="90"/>
<el-table-column prop="aspect" label="审批环节" align="center" />
<el-table-column prop="receiveTime" label="审批接收时间" align="center" />
<el-table-column prop="passTime" label="审批通过时间" align="center" />
<el-table-column prop="aspect" label="审批环节" align="center" width="150"/>
<el-table-column prop="receiveTime" label="审批接收时间" align="center" width="160"/>
<el-table-column prop="passTime" label="审批通过时间" align="center" width="160"/>
<el-table-column prop="approvalTime" label="审批用时" align="center" width="100"/>
<el-table-column prop="sysCount" label="系统催办次数" align="center" width="110"/>
<el-table-column prop="timeInterval" label="系统催办时间间隔" align="center" width="140"/>
<el-table-column prop="artificialCount" label="人工催办次数" align="center" width="110"/>
<el-table-column prop="artificialCount" label="人工催办次数" align="center" min-width="110"/>
</el-table>
</div>
<div class="pages">
@ -96,12 +99,11 @@ export default {
listLoading: false,
listQuery: {
params: {
createStartTime: '',
createEndTime: '',
createOrgSid: '',
userSid: '',
contractId: '',
customerName: ''
startTime: '',
endTime: '',
applyName: '',
useTime: '',
sysCount: ''
},
current: 1,
size: 10,
@ -176,12 +178,11 @@ export default {
handleReset() {
this.listQuery = {
params: {
createStartTime: '',
createEndTime: '',
createOrgSid: '',
userSid: '',
contractId: '',
customerName: ''
startTime: '',
endTime: '',
applyName: '',
useTime: '',
sysCount: ''
},
current: 1,
size: 10,

12
anrui-system-ui/src/api/flow/todo.js
View File

@ -108,6 +108,18 @@ export function breakProcess(params) {
})
}
// 已办任务列表--催办
export function manualReminder(params) {
return request({
url: '/message/v1/MessageUrgeList/manualReminder',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
}
// 审批记录--保存评论
export function commentSave(data) {
return request({

4
anrui-system-ui/src/views/Home/Home.vue
View File

@ -434,6 +434,10 @@ export default {
// let myPopup = window.open('http://127.0.0.1:9531/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
// let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
} else if (index == '6') {
// let myPopup = window.open('http://127.0.0.1:9531/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
// let myPopup = window.open('http://120.46.172.184/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
} else if (index == '0') {
// let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')

14
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -33,9 +33,10 @@
<div class="listcon">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width:100%" @selection-change="handleSelectionChange">
<el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="180px" label="操作" align="center">
<el-table-column width="230" label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleCheck(scope.row)">详情</el-button>
<el-button type="primary" size="small" v-if="scope.row.endTime == null" @click="handlePress(scope.row)">催办</el-button>
<el-button type="danger" v-show="scope.row.endTime === null && scope.row.startUserSid === listQuery.params.userSid" size="small" @click="handleTerminate(scope.row)">终止
</el-button>
</template>
@ -145,7 +146,7 @@ import flowRecords from '@/components/flow/flowRecord'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getStorage } from '@/utils/auth'
import { getList, selectUrl, readXml, getFlowViewer, breakProcess, commentSave, sysstaffinfo } from '@/api/flow/todo'
import { getList, selectUrl, readXml, getFlowViewer, manualReminder, commentSave, sysstaffinfo } from '@/api/flow/todo'
import { flowRecord } from '@/api/workflow/finished'
import { loginDetails } from '@/api/user'
import upload from '@/components/uploadFile/upload'
@ -344,6 +345,15 @@ export default {
this.url = ''
this.centerDialogVisible = false
},
handlePress(row) {
manualReminder({ proDefId: row.procDefId, procInstId: row.procInsId }).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: ' 催办成功' })
} else {
this.$message({ showClose: true, type: 'error', message: ' 操作失败' })
}
})
},
handleTerminate(row) {
this.breakProcessVisible = true
this.dialogList.comment = ''

Write Preview
Loading…
Cancel
Save