|
@@ -4,7 +4,7 @@
|
|
|
<div class="row m-row">
|
|
<div class="row m-row">
|
|
|
<div class="col-md-12 col-sm-12 col-xs-12">
|
|
<div class="col-md-12 col-sm-12 col-xs-12">
|
|
|
<input
|
|
<input
|
|
|
- v-model="taskQueryParam.condition"
|
|
|
|
|
|
|
+ v-model="needApproveRequest.condition"
|
|
|
autocomplete="off"
|
|
autocomplete="off"
|
|
|
type="text"
|
|
type="text"
|
|
|
:placeholder="$t('lang.NeedApproveWorkflow.describe1')"
|
|
:placeholder="$t('lang.NeedApproveWorkflow.describe1')"
|
|
@@ -14,7 +14,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div
|
|
<div
|
|
|
- v-if="taskQueryParam.advancedQuery"
|
|
|
|
|
|
|
+ v-if="needApproveRequest.advancedQuery"
|
|
|
class="row m-row"
|
|
class="row m-row"
|
|
|
>
|
|
>
|
|
|
<div class="col-md-2 col-sm-2 col-xs-4">
|
|
<div class="col-md-2 col-sm-2 col-xs-4">
|
|
@@ -23,19 +23,19 @@
|
|
|
|
|
|
|
|
<div class="col-md-5 col-sm-5 col-xs-4">
|
|
<div class="col-md-5 col-sm-5 col-xs-4">
|
|
|
<DateTime
|
|
<DateTime
|
|
|
- v-model="startAfter"
|
|
|
|
|
|
|
+ v-model="needApproveRequest.processInstanceStartAfter"
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="col-md-5 col-sm-5 col-xs-4">
|
|
<div class="col-md-5 col-sm-5 col-xs-4">
|
|
|
<DateTime
|
|
<DateTime
|
|
|
- v-model="startBefore"
|
|
|
|
|
|
|
+ v-model="needApproveRequest.processInstanceStartBefore"
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div
|
|
<div
|
|
|
- v-if="taskQueryParam.advancedQuery"
|
|
|
|
|
|
|
+ v-if="needApproveRequest.advancedQuery"
|
|
|
class="row m-row"
|
|
class="row m-row"
|
|
|
>
|
|
>
|
|
|
<div class="col-md-2 col-sm-2 col-xs-4">
|
|
<div class="col-md-2 col-sm-2 col-xs-4">
|
|
@@ -57,19 +57,7 @@
|
|
|
<label class="form-control-static">{{ $t("lang.NeedApproveWorkflow.subject") }}</label>
|
|
<label class="form-control-static">{{ $t("lang.NeedApproveWorkflow.subject") }}</label>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="col-md-10 col-sm-10 col-xs-8">
|
|
<div class="col-md-10 col-sm-10 col-xs-8">
|
|
|
- <select
|
|
|
|
|
- v-model="deploymentId"
|
|
|
|
|
- class="form-control"
|
|
|
|
|
- >
|
|
|
|
|
- <option value="">{{ $t("lang.NeedApproveWorkflow.all") }}</option>
|
|
|
|
|
- <option
|
|
|
|
|
- v-for="item in approveType"
|
|
|
|
|
- :key="item.deploymentId"
|
|
|
|
|
- :value="item.deploymentId"
|
|
|
|
|
- >
|
|
|
|
|
- {{ item.name }}
|
|
|
|
|
- </option>
|
|
|
|
|
- </select>
|
|
|
|
|
|
|
+ <WorkflowType v-model="needApproveRequest.windowNo" />
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
@@ -85,8 +73,8 @@
|
|
|
</button>
|
|
</button>
|
|
|
<a
|
|
<a
|
|
|
class="form-label"
|
|
class="form-label"
|
|
|
- @click="taskQueryParam.advancedQuery = !taskQueryParam.advancedQuery"
|
|
|
|
|
- >{{ (taskQueryParam.advancedQuery) ? $t("lang.NeedApproveWorkflow.closeAdvancedSearch") : $t("lang.NeedApproveWorkflow.advancedSearch") }}</a>
|
|
|
|
|
|
|
+ @click="needApproveRequest.advancedQuery = !needApproveRequest.advancedQuery"
|
|
|
|
|
+ >{{ (needApproveRequest.advancedQuery) ? $t("lang.NeedApproveWorkflow.closeAdvancedSearch") : $t("lang.NeedApproveWorkflow.advancedSearch") }}</a>
|
|
|
<a
|
|
<a
|
|
|
id="clearSearchCondition"
|
|
id="clearSearchCondition"
|
|
|
class="form-label"
|
|
class="form-label"
|
|
@@ -166,11 +154,12 @@ import CustomerTask from './CustomerTask.vue';
|
|
|
import { Notify, Uuid } from 'pc-component-v3';
|
|
import { Notify, Uuid } from 'pc-component-v3';
|
|
|
import TaskOpenUtil from './TaskOpenUtil.js';
|
|
import TaskOpenUtil from './TaskOpenUtil.js';
|
|
|
import * as dayjs from 'dayjs';
|
|
import * as dayjs from 'dayjs';
|
|
|
|
|
+import WorkflowType from './WorkflowType.vue';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
|
|
|
|
|
components: {
|
|
components: {
|
|
|
- CustomerTask,
|
|
|
|
|
|
|
+ CustomerTask, WorkflowType,
|
|
|
},
|
|
},
|
|
|
data: function () {
|
|
data: function () {
|
|
|
return {
|
|
return {
|
|
@@ -178,10 +167,21 @@ export default {
|
|
|
'defaultStartBefore': '', //默认结束日期
|
|
'defaultStartBefore': '', //默认结束日期
|
|
|
'startAfter': '', //开始日期
|
|
'startAfter': '', //开始日期
|
|
|
'startBefore': '', //结束日期
|
|
'startBefore': '', //结束日期
|
|
|
- 'taskQueryParam': { 'processStatusQuery': 'RUNNING' }, //查询条件
|
|
|
|
|
|
|
+ 'needApproveRequest': {
|
|
|
|
|
+ 'condition': null,
|
|
|
|
|
+ 'windowNo': null,
|
|
|
|
|
+ 'startUserId': null,
|
|
|
|
|
+ 'processInstanceStartAfter': null,
|
|
|
|
|
+ 'processInstanceStartBefore': null,
|
|
|
|
|
+ 'taskCreateTimeAfter': null,
|
|
|
|
|
+ 'taskCreateTimeBefore': null,
|
|
|
|
|
+ 'start': 0,
|
|
|
|
|
+ 'length': 10,
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
'taskInfos': [],
|
|
'taskInfos': [],
|
|
|
'userName': '',
|
|
'userName': '',
|
|
|
- 'deploymentId': '',
|
|
|
|
|
|
|
+ 'windowNo': '',
|
|
|
'approveType': [],
|
|
'approveType': [],
|
|
|
pagination: {
|
|
pagination: {
|
|
|
total: 0,
|
|
total: 0,
|
|
@@ -202,41 +202,23 @@ export default {
|
|
|
// 加载数据
|
|
// 加载数据
|
|
|
init: function () {
|
|
init: function () {
|
|
|
var _self = this;
|
|
var _self = this;
|
|
|
- _self.loading=true;
|
|
|
|
|
_self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
|
|
_self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
|
|
|
_self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
|
|
_self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
|
|
|
- _self.taskQueryParam = {
|
|
|
|
|
|
|
+ _self.needApproveRequest = {
|
|
|
'condition': '', //查询条件(主题、文件编码、正文内容、审批意见).
|
|
'condition': '', //查询条件(主题、文件编码、正文内容、审批意见).
|
|
|
'startAfter': _self.defaultStartAfter,
|
|
'startAfter': _self.defaultStartAfter,
|
|
|
'startBefore': _self.defaultStartBefore,
|
|
'startBefore': _self.defaultStartBefore,
|
|
|
'advancedQuery': false, //是否高级查询
|
|
'advancedQuery': false, //是否高级查询
|
|
|
//"startUserId" : "", //审批单发起人
|
|
//"startUserId" : "", //审批单发起人
|
|
|
- 'deploymentId': '', //工作流部署Id
|
|
|
|
|
|
|
+ 'windowNo': '', //工作流部署Id
|
|
|
'processStatusQuery': 'RUNNING', //审批状态
|
|
'processStatusQuery': 'RUNNING', //审批状态
|
|
|
'range': { //查询区间
|
|
'range': { //查询区间
|
|
|
'length': 100,
|
|
'length': 100,
|
|
|
'start': 0,
|
|
'start': 0,
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
|
- console.log(JSON.stringify(_self.taskQueryParam));
|
|
|
|
|
|
|
+ console.log(JSON.stringify(_self.needApproveRequest));
|
|
|
|
|
|
|
|
- $.ajax({
|
|
|
|
|
- url: Common.getApiURL('WorkflowResource/ApproveType'),
|
|
|
|
|
- type: 'GET',
|
|
|
|
|
- dataType: 'json',
|
|
|
|
|
- beforeSend: function (request) {
|
|
|
|
|
- Common.addTokenToRequest(request);
|
|
|
|
|
- },
|
|
|
|
|
- success: function (data) {
|
|
|
|
|
- _self.loading=false;
|
|
|
|
|
- _self.approveType = data;
|
|
|
|
|
- _self.search();
|
|
|
|
|
- },
|
|
|
|
|
- error: function (XMLHttpRequest, textStatus, errorThrown) {
|
|
|
|
|
- _self.loading=false;
|
|
|
|
|
- Common.processException(XMLHttpRequest, textStatus, errorThrown);
|
|
|
|
|
- },
|
|
|
|
|
- });
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
@@ -246,23 +228,23 @@ export default {
|
|
|
_self.loading=true;
|
|
_self.loading=true;
|
|
|
|
|
|
|
|
_self.pagination.current_page = 1;
|
|
_self.pagination.current_page = 1;
|
|
|
- _self.taskQueryParam.range.start = 0;
|
|
|
|
|
- _self.taskQueryParam.range.length = _self.pagination.per_page;
|
|
|
|
|
- if (_self.taskQueryParam.advancedQuery) {
|
|
|
|
|
|
|
+ _self.needApproveRequest.range.start = 0;
|
|
|
|
|
+ _self.needApproveRequest.range.length = _self.pagination.per_page;
|
|
|
|
|
+ if (_self.needApproveRequest.advancedQuery) {
|
|
|
_self.getStartUserId();
|
|
_self.getStartUserId();
|
|
|
- _self.taskQueryParam.startAfter = _self.startAfter;
|
|
|
|
|
- _self.taskQueryParam.startBefore = _self.startBefore;
|
|
|
|
|
|
|
+ _self.needApproveRequest.startAfter = _self.startAfter;
|
|
|
|
|
+ _self.needApproveRequest.startBefore = _self.startBefore;
|
|
|
}
|
|
}
|
|
|
- _self.taskQueryParam.deploymentId = _self.deploymentId;
|
|
|
|
|
|
|
+ _self.needApproveRequest.windowNo = _self.windowNo;
|
|
|
$.ajax({
|
|
$.ajax({
|
|
|
- url: Common.getApiURL('WorkflowResource/NeedApprove'),
|
|
|
|
|
|
|
+ url: Common.getApiURL('WorkflowResource/needApprove'),
|
|
|
type: 'post',
|
|
type: 'post',
|
|
|
dataType: 'json',
|
|
dataType: 'json',
|
|
|
beforeSend: function (request) {
|
|
beforeSend: function (request) {
|
|
|
Common.addTokenToRequest(request);
|
|
Common.addTokenToRequest(request);
|
|
|
},
|
|
},
|
|
|
contentType: 'application/json',
|
|
contentType: 'application/json',
|
|
|
- data: JSON.stringify(_self.taskQueryParam),
|
|
|
|
|
|
|
+ data: JSON.stringify(_self.needApproveRequest),
|
|
|
success: function (data) {
|
|
success: function (data) {
|
|
|
_self.loading=false;
|
|
_self.loading=false;
|
|
|
_self.taskInfos = data;
|
|
_self.taskInfos = data;
|
|
@@ -284,7 +266,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
_self.pagination.total = data.totalCount;
|
|
_self.pagination.total = data.totalCount;
|
|
|
- _self.pagination.last_page = Math.ceil(data.totalCount / _self.taskQueryParam.range.length);
|
|
|
|
|
|
|
+ _self.pagination.last_page = Math.ceil(data.totalCount / _self.needApproveRequest.range.length);
|
|
|
},
|
|
},
|
|
|
error: function (XMLHttpRequest, textStatus, errorThrown) {
|
|
error: function (XMLHttpRequest, textStatus, errorThrown) {
|
|
|
_self.loading=false;
|
|
_self.loading=false;
|
|
@@ -320,9 +302,9 @@ export default {
|
|
|
async: false,
|
|
async: false,
|
|
|
success: function (data) {
|
|
success: function (data) {
|
|
|
_self.loading=false;
|
|
_self.loading=false;
|
|
|
- _self.taskQueryParam.startUserId = '';
|
|
|
|
|
|
|
+ _self.needApproveRequest.startUserId = '';
|
|
|
if (data.dataList[0].id != null) {
|
|
if (data.dataList[0].id != null) {
|
|
|
- _self.taskQueryParam.startUserId = data.dataList[0].id;
|
|
|
|
|
|
|
+ _self.needApproveRequest.startUserId = data.dataList[0].id;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
error: function (XMLHttpRequest, textStatus, errorThrown) {
|
|
error: function (XMLHttpRequest, textStatus, errorThrown) {
|
|
@@ -336,11 +318,11 @@ export default {
|
|
|
//是否开启高级查询
|
|
//是否开启高级查询
|
|
|
isAdvancedQuery: function (flag) {
|
|
isAdvancedQuery: function (flag) {
|
|
|
let _self = this;
|
|
let _self = this;
|
|
|
- _self.taskQueryParam.advancedQuery = flag;
|
|
|
|
|
|
|
+ _self.needApproveRequest.advancedQuery = flag;
|
|
|
if (!flag) {
|
|
if (!flag) {
|
|
|
//初始化日期
|
|
//初始化日期
|
|
|
- _self.taskQueryParam.startAfter = _self.defaultStartAfter;
|
|
|
|
|
- _self.taskQueryParam.startBefore = _self.defaultStartBefore;
|
|
|
|
|
|
|
+ _self.needApproveRequest.startAfter = _self.defaultStartAfter;
|
|
|
|
|
+ _self.needApproveRequest.startBefore = _self.defaultStartBefore;
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -348,7 +330,7 @@ export default {
|
|
|
clean: function () { //清空搜索条件
|
|
clean: function () { //清空搜索条件
|
|
|
var _self = this;
|
|
var _self = this;
|
|
|
_self.userName = '';
|
|
_self.userName = '';
|
|
|
- _self.taskQueryParam.condition = '';
|
|
|
|
|
|
|
+ _self.needApproveRequest.condition = '';
|
|
|
_self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
|
|
_self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
|
|
|
_self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
|
|
_self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
|
|
|
_self.startAfter = '';
|
|
_self.startAfter = '';
|
|
@@ -357,28 +339,28 @@ export default {
|
|
|
changePage: function () {
|
|
changePage: function () {
|
|
|
var _self = this;
|
|
var _self = this;
|
|
|
_self.loading=true;
|
|
_self.loading=true;
|
|
|
- _self.taskQueryParam.range.start = (_self.pagination.current_page - 1) * _self.pagination.per_page;
|
|
|
|
|
- _self.taskQueryParam.range.length = _self.pagination.per_page;
|
|
|
|
|
- _self.taskQueryParam.startAfter = _self.defaultStartAfter;
|
|
|
|
|
- _self.taskQueryParam.startBefore = _self.defaultStartBefore;
|
|
|
|
|
- _self.taskQueryParam.finishAfter = _self.defaultFinishAfter;
|
|
|
|
|
- _self.taskQueryParam.finishBefore = _self.defaultFinishBefore;
|
|
|
|
|
- if (_self.taskQueryParam.advancedQuery) {
|
|
|
|
|
- _self.taskQueryParam.startAfter = _self.startAfter;
|
|
|
|
|
- _self.taskQueryParam.startBefore = _self.startBefore;
|
|
|
|
|
- _self.taskQueryParam.finishAfter = _self.finishAfter;
|
|
|
|
|
- _self.taskQueryParam.finishBefore = _self.finishBefore;
|
|
|
|
|
|
|
+ _self.needApproveRequest.range.start = (_self.pagination.current_page - 1) * _self.pagination.per_page;
|
|
|
|
|
+ _self.needApproveRequest.range.length = _self.pagination.per_page;
|
|
|
|
|
+ _self.needApproveRequest.startAfter = _self.defaultStartAfter;
|
|
|
|
|
+ _self.needApproveRequest.startBefore = _self.defaultStartBefore;
|
|
|
|
|
+ _self.needApproveRequest.finishAfter = _self.defaultFinishAfter;
|
|
|
|
|
+ _self.needApproveRequest.finishBefore = _self.defaultFinishBefore;
|
|
|
|
|
+ if (_self.needApproveRequest.advancedQuery) {
|
|
|
|
|
+ _self.needApproveRequest.startAfter = _self.startAfter;
|
|
|
|
|
+ _self.needApproveRequest.startBefore = _self.startBefore;
|
|
|
|
|
+ _self.needApproveRequest.finishAfter = _self.finishAfter;
|
|
|
|
|
+ _self.needApproveRequest.finishBefore = _self.finishBefore;
|
|
|
}
|
|
}
|
|
|
- console.log(JSON.stringify(_self.taskQueryParam));
|
|
|
|
|
|
|
+ console.log(JSON.stringify(_self.needApproveRequest));
|
|
|
$.ajax({
|
|
$.ajax({
|
|
|
- url: Common.getApiURL('WorkflowResource/NeedApprove'),
|
|
|
|
|
|
|
+ url: Common.getApiURL('WorkflowResource/needApprove'),
|
|
|
type: 'post',
|
|
type: 'post',
|
|
|
dataType: 'json',
|
|
dataType: 'json',
|
|
|
contentType: 'application/json',
|
|
contentType: 'application/json',
|
|
|
beforeSend: function (request) {
|
|
beforeSend: function (request) {
|
|
|
Common.addTokenToRequest(request);
|
|
Common.addTokenToRequest(request);
|
|
|
},
|
|
},
|
|
|
- data: JSON.stringify(_self.taskQueryParam),
|
|
|
|
|
|
|
+ data: JSON.stringify(_self.needApproveRequest),
|
|
|
success: function (data) {
|
|
success: function (data) {
|
|
|
_self.loading=false;
|
|
_self.loading=false;
|
|
|
_self.taskInfos = data;
|
|
_self.taskInfos = data;
|
|
@@ -400,7 +382,7 @@ export default {
|
|
|
|
|
|
|
|
});
|
|
});
|
|
|
_self.pagination.total = data.totalCount;
|
|
_self.pagination.total = data.totalCount;
|
|
|
- _self.pagination.last_page = Math.ceil(data.totalCount / _self.taskQueryParam.range.length);
|
|
|
|
|
|
|
+ _self.pagination.last_page = Math.ceil(data.totalCount / _self.needApproveRequest.range.length);
|
|
|
console.log('totalCount=' + _self.pagination.total);
|
|
console.log('totalCount=' + _self.pagination.total);
|
|
|
console.log('totalPage=' + _self.pagination.last_page);
|
|
console.log('totalPage=' + _self.pagination.last_page);
|
|
|
},
|
|
},
|