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-10-14 14:56:47 +08:00
parent 24afd1f144 08bbc9a6ad
commit 9af1f4320b
7 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+27 -1
View File
@@ -68,6 +68,7 @@ router.beforeEach(function (to, from, next) {
let prcNum = to.query.prcNum;
let prcName = to.query.prcName;
let prcType = to.query.prcType;
let routerType = to.query.routerType;
let param = "taskIds=" + taskId + "&prcId=" + prcId
+ "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
console.log(store)
@@ -162,12 +163,37 @@ router.beforeEach(function (to, from, next) {
}
} else { // 业务系统 当前节点未完成
// commitStatus 大于0 表示当前节点存在未完成干活流程
if (isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
// isNotFinished OA 系统显示接受任务 已置为已办
if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
if (prcType === '3') {
//标准征求意见 接受节点 未完成 oa已办 跳转详情页面
if (path === '/bzzqyjStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '5') {
if (path === '/xmpgStep4') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '2') {
if (path === '/bzdyStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '9') {
if (path === '/bzjdStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '6') {
if (path === '/xmpg2Step6') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '10') {
if (path === '/xmqdqrStep2') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '8') {
if (path === '/wfhxzgStep4') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}
} else {
// oa 待测 sso
src/pages/processCenter/pages/components/ProcessFooter.vue
+2 -2
View File
@@ -70,7 +70,7 @@
size="mini"
class="common-button-primary"
@click="handleSave"
:loading="saveLoading"
:loading="submitLoading"
v-if="showSave">
<i class="iconfont">&#xe608;</i>
保存
@@ -80,7 +80,7 @@
size="small"
class="common-button-danger"
@click="beforeBack"
:loading="isSubmitBack"
:loading="submitLoading"
v-if="showBack">
<i class="iconfont" style="font-size: 12px;">&#xe615;</i>
{{ backBTNText }}</el-button>
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -183,13 +183,13 @@
</el-table>
</div>
<ProcessFooter
show-save
:show-save="submitShow"
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:show-submit="submitShow"
:show-confirm="acceptShow"
show-transfer
:show-transfer="submitShow"
@transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+4
View File
@@ -230,6 +230,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
@@ -256,6 +257,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
@@ -277,6 +279,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
@@ -298,6 +301,7 @@
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
v-model="dataList[scope.$index].completionTime"
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+7 -3
View File
@@ -44,7 +44,7 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
</el-button>
</div>
</div>
@@ -142,6 +142,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
@@ -168,6 +169,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
@@ -189,6 +191,7 @@
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
@@ -210,6 +213,7 @@
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
v-model="scope.row.completionTime"
@@ -422,9 +426,9 @@
</div>
</div>
<ProcessFooter
show-save
:show-save="submitShow"
show-submit
show-transfer
:show-transfer="submitShow"
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+7 -7
View File
@@ -52,8 +52,8 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
<el-button plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
<el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
<el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
</div>
</div>
<el-table
@@ -382,10 +382,10 @@
</div>
</el-drawer>
<ProcessFooter
show-save
show-transfer
show-affirm
show-confirm
:show-save="submitShow"
:show-transfer="submitShow"
:show-affirm="submitShow"
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
@@ -412,7 +412,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
export default {
name: "xmqdqrStep2",
src/router/index.js
+9
View File
@@ -249,6 +249,15 @@ const routes = [
title: '流程详情'
}
},
{
path: '/processAcceptDetail',
name: 'ProcessAcceptDetail',
component: () => import('@/pages/processCenter/pages/processAcceptDetail/index.vue'),
meta: {
requireAuth: true,
title: '流程详情'
}
},
{
path: '/bzffStep1',
name: 'bzffStep1',