ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 修改bug80161,80162

Browse Source
This commit is contained in:
lideqin
2024-01-05 15:11:27 +08:00
parent d1a85655c3
commit 8e3b568cb1
10 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/PersonnelInfo.vue
+1 -1
View File
@@ -5,7 +5,7 @@
:class="{'red-tail': index < currentNodeIndex}"> :class="{'red-tail': index < currentNodeIndex}">
<template #icon> <template #icon>
<div class="step-cus-icon" <div class="step-cus-icon"
:class="{'step-cus-icon-done': index < currentNodeIndex, 'step-cus-icon-now': step.nodeName === currentNode}"> :class="{'step-cus-icon-done': index < currentNodeIndex, 'step-cus-icon-now': index === currentNodeIndex}">
<i class="iconfont icon-user" /> <i class="iconfont icon-user" />
</div> </div>
</template> </template>
src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+3 -1
View File
@@ -99,7 +99,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_ANNUAL_REPORT.value"> <process-detail-list :processKey="ProcessKey.ES_ANNUAL_REPORT.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
@@ -190,6 +190,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsRevisionPlanActivityReportNodes.standardizationStart.value) { if (nodeId === EsRevisionPlanActivityReportNodes.standardizationStart.value) {
// 标准化工程师发起 // 标准化工程师发起
this.currentNode = 1 this.currentNode = 1
@@ -291,6 +292,7 @@ export default {
}, },
currentNode: 1, currentNode: 1,
currentNodeName: '', currentNodeName: '',
currentNodeId: EsRevisionPlanActivityReportNodes.standardizationStart.value, // 当前节点id
approvalInfoForm: this.$form.createForm(this), // 审批信息表单 approvalInfoForm: this.$form.createForm(this), // 审批信息表单
personnelInfoData: [], // 人员信息数据 personnelInfoData: [], // 人员信息数据
url: { url: {
src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+3 -1
View File
@@ -86,7 +86,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_ANNUAL_INIT.value"> <process-detail-list :processKey="ProcessKey.ES_ANNUAL_INIT.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
@@ -178,6 +178,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationStart.value) { if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationStart.value) {
// 标准化工程师发起 // 标准化工程师发起
this.currentNode = 1 this.currentNode = 1
@@ -289,6 +290,7 @@ export default {
}, },
currentNode: 1, currentNode: 1,
currentNodeName: '', currentNodeName: '',
currentNodeId: EsRevisionPlanStandardizationInitNodes.standardizationStart.value, // 当前节点id
approvalInfoForm: this.$form.createForm(this), // 审批信息表单 approvalInfoForm: this.$form.createForm(this), // 审批信息表单
personnelInfoData: [], // 人员信息数据 personnelInfoData: [], // 人员信息数据
url: { url: {
src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+3 -1
View File
@@ -78,7 +78,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_ABOLISH.value"> <process-detail-list :processKey="ProcessKey.ES_ABOLISH.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="['relatedUserList']"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -145,6 +145,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsAnnulNodes.initiatorStart.value) { if (nodeId === EsAnnulNodes.initiatorStart.value) {
// 发起人发起 // 发起人发起
this.currentNode = 1 this.currentNode = 1
@@ -198,6 +199,7 @@ export default {
disabled: false, disabled: false,
currentNode: 1, // 当前节点 currentNode: 1, // 当前节点
currentNodeName: '', currentNodeName: '',
currentNodeId: EsAnnulNodes.initiatorStart.value, // 当前节点id
model: {}, model: {},
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {
src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
+3 -1
View File
@@ -79,7 +79,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_CHANGE.value"> <process-detail-list :processKey="ProcessKey.ES_CHANGE.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -148,6 +148,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsChangeNodes.mainDrafterStart.value) { if (nodeId === EsChangeNodes.mainDrafterStart.value) {
this.currentNode = 1 this.currentNode = 1
} else if (nodeId === EsChangeNodes.relevantPersonnelCheck.value) { } else if (nodeId === EsChangeNodes.relevantPersonnelCheck.value) {
@@ -199,6 +200,7 @@ export default {
disabled: false, disabled: false,
currentNode: 1, // 当前节点 currentNode: 1, // 当前节点
currentNodeName: '', currentNodeName: '',
currentNodeId: EsChangeNodes.mainDrafterStart.value, // 当前节点id
model: {}, model: {},
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {
src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+3 -2
View File
@@ -210,7 +210,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_INIT_CHANGE.value"> <process-detail-list :processKey="ProcessKey.ES_INIT_CHANGE.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -314,6 +314,7 @@ export default {
// 初始化流程节点 // 初始化流程节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsInitChangeNodes.mainDrafterStart.value) { if (nodeId === EsInitChangeNodes.mainDrafterStart.value) {
this.currentNode = 1 this.currentNode = 1
} else if (nodeId === EsInitChangeNodes.contactCheck.value) { } else if (nodeId === EsInitChangeNodes.contactCheck.value) {
@@ -377,7 +378,7 @@ export default {
categoryTypeDisabled: false, // 申请类型和项目类别不可更改 categoryTypeDisabled: false, // 申请类型和项目类别不可更改
currentNode: 1, // 当前节点 currentNode: 1, // 当前节点
currentNodeName: '', // 当前节点名称 currentNodeName: '', // 当前节点名称
currentNodeId: '', // 当前节点id currentNodeId: EsInitChangeNodes.mainDrafterStart.value, // 当前节点id
model: [], model: [],
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {
src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+3 -1
View File
@@ -81,7 +81,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_RECHECK.value"> <process-detail-list :processKey="ProcessKey.ES_RECHECK.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="notPermissField"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="notPermissField"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -173,6 +173,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsRecheckNodes.standardizationSelectContact.value) { if (nodeId === EsRecheckNodes.standardizationSelectContact.value) {
// 标准化工程师选择联络人 // 标准化工程师选择联络人
this.currentNode = 1 this.currentNode = 1
@@ -247,6 +248,7 @@ export default {
disabled: false, disabled: false,
currentNode: 2, // 当前节点 currentNode: 2, // 当前节点
currentNodeName: '', currentNodeName: '',
currentNodeId: EsRecheckNodes.initiatorStart.value, // 当前节点id
model: {}, model: {},
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {
src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+3 -1
View File
@@ -108,7 +108,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_EDIT.value"> <process-detail-list :processKey="ProcessKey.ES_EDIT.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="notPermissField"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="notPermissField"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
@@ -222,6 +222,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsRevisionNodes.mainDrafterSend.value) { if (nodeId === EsRevisionNodes.mainDrafterSend.value) {
// 主起草人起草分发 // 主起草人起草分发
this.currentNode = 1 this.currentNode = 1
@@ -362,6 +363,7 @@ export default {
model: {}, model: {},
currentNode: 1, currentNode: 1,
currentNodeName: '', // 当前节点名称 currentNodeName: '', // 当前节点名称
currentNodeId: EsRevisionNodes.mainDrafterSend.value, // 当前节点id
approvalInfoForm: this.$form.createForm(this), // 审批信息表单 approvalInfoForm: this.$form.createForm(this), // 审批信息表单
personnelInfoData: [], // 人员信息数据 personnelInfoData: [], // 人员信息数据
url: { url: {
src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+3 -1
View File
@@ -78,7 +78,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_ARCHIVE.value"> <process-detail-list :processKey="ProcessKey.ES_ARCHIVE.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="['relatedUserList']"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -145,6 +145,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsSealSaveNodes.initiatorStart.value) { if (nodeId === EsSealSaveNodes.initiatorStart.value) {
// 发起人发起 // 发起人发起
this.currentNode = 1 this.currentNode = 1
@@ -198,6 +199,7 @@ export default {
disabled: false, disabled: false,
currentNode: 1, // 当前节点 currentNode: 1, // 当前节点
currentNodeName: '', currentNodeName: '',
currentNodeId: EsSealSaveNodes.initiatorStart.value, // 当前节点id
model: {}, model: {},
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {
src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+3 -1
View File
@@ -78,7 +78,7 @@
<!-- 人员信息 --> <!-- 人员信息 -->
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0"> <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
<process-detail-list :processKey="ProcessKey.ES_ENABLE.value"> <process-detail-list :processKey="ProcessKey.ES_ENABLE.value">
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info> <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="['relatedUserList']"></personnel-info>
</process-detail-list> </process-detail-list>
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@@ -145,6 +145,7 @@ export default {
// 初始化节点 // 初始化节点
const nodeId = this.$route.query.nodeId const nodeId = this.$route.query.nodeId
if (nodeId) { if (nodeId) {
this.currentNodeId = nodeId
if (nodeId === EsStartUseNodes.initiatorStart.value) { if (nodeId === EsStartUseNodes.initiatorStart.value) {
// 发起人发起 // 发起人发起
this.currentNode = 1 this.currentNode = 1
@@ -198,6 +199,7 @@ export default {
disabled: false, disabled: false,
currentNode: 1, // 当前节点 currentNode: 1, // 当前节点
currentNodeName: '', currentNodeName: '',
currentNodeId: EsStartUseNodes.initiatorStart.value, // 当前节点id
model: {}, model: {},
processInfoForm: this.$form.createForm(this), processInfoForm: this.$form.createForm(this),
labelCol: { labelCol: {