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

[update] 修改年度制修订流程

Browse Source
This commit is contained in:
lideqin
2023-12-11 13:46:22 +08:00
parent b033e81d8b
commit e8f935d04a
5 changed files with 110 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+1 -1
View File
@@ -73,7 +73,7 @@
<!-- 节点4、收集联络人主管级领导审批 只有表格,不能操作 --> <!-- 节点4、收集联络人主管级领导审批 只有表格,不能操作 -->
<only-table-form v-else-if="currentNode === 4" disabled ref="baseInfoFormRef"></only-table-form> <only-table-form v-else-if="currentNode === 4" disabled ref="baseInfoFormRef"></only-table-form>
<!-- 节点5、各部所联络人汇总 只有表格，可操作 --> <!-- 节点5、各部所联络人汇总 只有表格，可操作 -->
<only-table-form v-else-if="currentNode === 5" ref="baseInfoFormRef"></only-table-form> <only-table-form v-else-if="currentNode === 5" ref="baseInfoFormRef" :currentNode="5"></only-table-form>
<!-- 节点6、联络人主管级上一级领导审批 表格不可操作，可以查看详情 --> <!-- 节点6、联络人主管级上一级领导审批 表格不可操作，可以查看详情 -->
<only-table-form v-else-if="currentNode === 6" onlyCanLook ref="baseInfoFormRef"></only-table-form> <only-table-form v-else-if="currentNode === 6" onlyCanLook ref="baseInfoFormRef"></only-table-form>
<!-- 节点7、标准化工程师归档 表格不可新增，可以编辑和查看详情 --> <!-- 节点7、标准化工程师归档 表格不可新增，可以编辑和查看详情 -->
src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+17 -17
View File
@@ -51,23 +51,23 @@
</div> </div>
<!-- 标准立项-制定 --> <!-- 标准立项-制定 -->
<template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value"> <template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value">
<!-- 企标编号-新企标编号 --> <!-- 企标编号-新企标编号 流程结束才生成企标编号 -->
<div class="box-title-text form-flex-item-half"> <!--<div class="box-title-text form-flex-item-half">-->
<div class="title-text"> <!-- <div class="title-text">-->
<!--<span class="required">*</span>--> <!-- &lt;!&ndash;<span class="required">*</span>&ndash;&gt;-->
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"> <!-- <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">-->
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }} <!-- {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}-->
</span> <!-- </span>-->
</div> <!-- </div>-->
<a-form-model-item class="item-model" prop="newEnStandardNo"> <!-- <a-form-model-item class="item-model" prop="newEnStandardNo">-->
<a-input class="box-input" <!-- <a-input class="box-input"-->
v-model="formInline.newEnStandardNo" <!-- v-model="formInline.newEnStandardNo"-->
:maxLength="50" <!-- :maxLength="50"-->
disabled <!-- disabled-->
@change="event => event.target.value = event.target.value.trim()" <!-- @change="event => event.target.value = event.target.value.trim()"-->
:placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" /> <!-- :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!--</div>-->
<!-- 企标名称-新企标名称 --> <!-- 企标名称-新企标名称 -->
<div class="box-title-text form-flex-item-half"> <div class="box-title-text form-flex-item-half">
<div class="title-text"> <div class="title-text">
src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
+16
View File
@@ -105,6 +105,11 @@ export default {
type: Boolean, type: Boolean,
required: false, required: false,
default: false default: false
},
currentNode: {
type: Number,
required: false,
default: 0
} }
}, },
computed: { computed: {
@@ -124,6 +129,17 @@ export default {
if (this.disabled) { if (this.disabled) {
this.columns.pop() this.columns.pop()
} }
// 当前节点是各部所联络人汇总节点，需要增加创建人列
if (this.currentNode && this.currentNode === 5) {
this.columns.splice(17, 0, {
// 创建人
title: this.$t('creator'),
align: 'center',
width: 180,
dataIndex: 'createBy_dictText',
scopedSlots: { customRender: 'text' }
})
}
}, },
data () { data () {
return { return {
src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+74 -82
View File
@@ -52,22 +52,22 @@
<!-- 标准立项-制定 --> <!-- 标准立项-制定 -->
<template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value"> <template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value">
<!-- 企标编号 --> <!-- 企标编号 -->
<div class="box-title-text form-flex-item-half"> <!--<div class="box-title-text form-flex-item-half">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span v-if="rules.newEnStandardNo[0].required" class="required">*</span> <!-- <span v-if="rules.newEnStandardNo[0].required" class="required">*</span>-->
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"> <!-- <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">-->
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }} <!-- {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}-->
</span> <!-- </span>-->
</div> <!-- </div>-->
<a-form-model-item class="item-model" prop="newEnStandardNo"> <!-- <a-form-model-item class="item-model" prop="newEnStandardNo">-->
<a-input class="box-input" <!-- <a-input class="box-input"-->
v-model="formInline.newEnStandardNo" <!-- v-model="formInline.newEnStandardNo"-->
:maxLength="50" <!-- :maxLength="50"-->
disabled <!-- disabled-->
@change="event => event.target.value = event.target.value.trim()" <!-- @change="event => event.target.value = event.target.value.trim()"-->
:placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" /> <!-- :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!--</div>-->
<!-- 企标名称 --> <!-- 企标名称 -->
<div class="box-title-text form-flex-item-half"> <div class="box-title-text form-flex-item-half">
<div class="title-text"> <div class="title-text">
@@ -154,7 +154,6 @@
:default-value="yearNumberDefaultValue" :default-value="yearNumberDefaultValue"
date-format="YYYY" date-format="YYYY"
:disabled="disabled" :disabled="disabled"
@change="decadeCodeChange"
:placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.yearNumber')" /> :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.yearNumber')" />
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -385,13 +384,14 @@
</span> </span>
</div> </div>
<a-form-model-item class="item-model" prop="componentName"> <a-form-model-item class="item-model" prop="componentName">
<a-tree-select v-model="formInline.componentName" <tree-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')"
:getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="formInline.componentName"
style="width: 100%" @nameChange="treeSelectNameChange"
:tree-data="partNameOptions" filedName="componentName"
:label-in-value="false" type="checkbox"
:disabled="disabled" :nameStr="formInline.componentName_dictText"
:placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')" /> dict-id="1696007957666533377"
:disabled="disabled" />
</a-form-model-item> </a-form-model-item>
</div> </div>
<!-- 授权部门 --> <!-- 授权部门 -->
@@ -509,7 +509,6 @@
<script> <script>
import { StandardSource, ProjectType, ApplicationCategory } from '@/enums/commonEnums' import { StandardSource, ProjectType, ApplicationCategory } from '@/enums/commonEnums'
import { getFormDictTreeList } from '@/api/api'
import UserSelection from '@/components/selection/UserSelection' import UserSelection from '@/components/selection/UserSelection'
import StandardSelection from '@/components/selection/StandardSelection' import StandardSelection from '@/components/selection/StandardSelection'
import UploadFile from '@/components/UploadFile' import UploadFile from '@/components/UploadFile'
@@ -517,10 +516,11 @@ import { getTreeList } from '@/api/enterpriseStandardLibraryApi'
import Vue from 'vue' import Vue from 'vue'
import { USER_INFO } from '@/store/mutation-types' import { USER_INFO } from '@/store/mutation-types'
import { getEnStandardNo } from '@/api/workCenter' import { getEnStandardNo } from '@/api/workCenter'
import TreeSelection from '@/components/selection/TreeSelection'
export default { export default {
name: 'BaseInfoTableModal', name: 'BaseInfoTableModal',
components: { UserSelection, StandardSelection, UploadFile }, components: { UserSelection, StandardSelection, UploadFile, TreeSelection },
props: { props: {
/** /**
* 编辑角色，是主起草人的话三个日期标准化填了的，主起草人不能修改；是联络人的话标准化未填写，联络人必填 * 编辑角色，是主起草人的话三个日期标准化填了的，主起草人不能修改；是联络人的话标准化未填写，联络人必填
@@ -546,7 +546,6 @@ export default {
StandardSource, StandardSource,
ProjectType, ProjectType,
ApplicationCategory, ApplicationCategory,
partNameOptions: [], // 零部件名称下拉框数据
standardSystemOptions: [], // 企标体系下拉框数据 standardSystemOptions: [], // 企标体系下拉框数据
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
@@ -734,21 +733,20 @@ export default {
} }
}, },
watch: { watch: {
// 企业标准代号 // // 企业标准代号
'formInline.enStandardCode' (value) { // 'formInline.enStandardCode' (value) {
this.getEnStandardNo() // this.getEnStandardNo()
}, // },
// 企业名称代号 // // 企业名称代号
'formInline.enNameCode' (value) { // 'formInline.enNameCode' (value) {
this.getEnStandardNo() // this.getEnStandardNo()
}, // },
// 标准类别代号 // // 标准类别代号
'formInline.standardCategoryCode' (value) { // 'formInline.standardCategoryCode' (value) {
this.getEnStandardNo() // this.getEnStandardNo()
} // }
}, },
mounted () { mounted () {
this.initPartNameOptions()
this.initStandardSystemOptions() this.initStandardSystemOptions()
if (this.source === 'tableBaseInfo') { if (this.source === 'tableBaseInfo') {
for (const item of Object.values(this.rules)) { for (const item of Object.values(this.rules)) {
@@ -832,48 +830,6 @@ export default {
this.formInline = Object.assign({}, record) this.formInline = Object.assign({}, record)
this.disabled = true this.disabled = true
}, },
// watch监视年代号会滞后
decadeCodeChange (value) {
this.getEnStandardNo()
},
// 根据三个代号和一个年代号获取企标编号
getEnStandardNo () {
// 如果是制定根据填的三个代号和一个年代号获取
if (this.formInline.projectType === ProjectType.ENACT.value) {
if (!this.formInline.enStandardCode || !this.formInline.enNameCode ||
!this.formInline.standardCategoryCode || !this.formInline.decadeCode) {
return
}
const param = {}
param.enStandardCode = this.formInline.enStandardCode
param.enNameCode = this.formInline.enNameCode
param.standardCategoryCode = this.formInline.standardCategoryCode
param.decadeCode = this.formInline.decadeCode
getEnStandardNo(param).then(res => {
if (res.success) {
this.$set(this.formInline, 'newEnStandardNo', res.message)
this.$forceUpdate()
}
})
} else {
// 是修订，通过选中的企标编号和年代号拼接新企标编号
if (this.formInline.originEnStandardNo && this.formInline.decadeCode) {
const standardNo = this.formInline.originEnStandardNo.split('-')[0] + '-' + this.formInline.decadeCode
this.$set(this.formInline, 'newEnStandardNo', standardNo)
this.$forceUpdate()
// 返回流程名称
this.returnProcessName()
}
}
},
// 获取零部件名称下拉框数据
initPartNameOptions () {
getFormDictTreeList({ dictId: '1696821512600637441' }).then(res => {
if (res.success) {
this.partNameOptions = res.result
}
})
},
// 获取标准体系下拉框数据 // 获取标准体系下拉框数据
initStandardSystemOptions () { initStandardSystemOptions () {
getTreeList({ option: 1 }).then(res => { getTreeList({ option: 1 }).then(res => {
@@ -882,6 +838,42 @@ export default {
} }
}) })
}, },
// watch监视年代号会滞后
// decadeCodeChange (value) {
// this.getEnStandardNo()
// },
// 根据三个代号和一个年代号获取企标编号
// getEnStandardNo () {
// // 如果是制定根据填的三个代号和一个年代号获取
// if (this.formInline.projectType === ProjectType.ENACT.value) {
// if (!this.formInline.enStandardCode || !this.formInline.enNameCode ||
// !this.formInline.standardCategoryCode || !this.formInline.decadeCode) {
// return
// }
// const param = {}
// param.enStandardCode = this.formInline.enStandardCode
// param.enNameCode = this.formInline.enNameCode
// param.standardCategoryCode = this.formInline.standardCategoryCode
// param.decadeCode = this.formInline.decadeCode
// getEnStandardNo(param).then(res => {
// if (res.success) {
// this.$set(this.formInline, 'newEnStandardNo', res.message)
// this.$forceUpdate()
// }
// })
// } else {
// // 是修订，通过选中的企标编号和年代号拼接新企标编号
// if (this.formInline.originEnStandardNo && this.formInline.decadeCode) {
// const standardNo = this.formInline.originEnStandardNo.split('-')[0] + '-' + this.formInline.decadeCode
// this.$set(this.formInline, 'newEnStandardNo', standardNo)
// this.$forceUpdate()
// }
// }
// },
// 零部件名称选择完成的回调
treeSelectNameChange (value, fieldName) {
this.formInline[fieldName + '_dictText'] = value
},
// 标准选择组件返回标准名称的回调 // 标准选择组件返回标准名称的回调
nameChange (value) { nameChange (value) {
this.formInline.originEnStandardName = value this.formInline.originEnStandardName = value
src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
+2 -2
View File
@@ -19,7 +19,7 @@
{{ $t('batchDelete') }} {{ $t('batchDelete') }}
</a-button> </a-button>
<!-- 批量设置联络人 --> <!-- 批量设置联络人 -->
<a-button icon="setting" type="primary" ghost @click="batchSetContact"> <a-button v-if="!isRejectedTodo" icon="setting" type="primary" ghost @click="batchSetContact">
{{ $t('workCenter.revisionPlanActivelyReport.batchSetContact') }} {{ $t('workCenter.revisionPlanActivelyReport.batchSetContact') }}
</a-button> </a-button>
</div> </div>
@@ -278,7 +278,7 @@ export default {
* 需要能判断是否是被驳回，产生的待办点击进入的，是的话需要显示带出被驳回的法规的联络人， * 需要能判断是否是被驳回，产生的待办点击进入的，是的话需要显示带出被驳回的法规的联络人，
* 并且去掉批量设置联络人按钮，如需修改联络人，删除该标准重新走标准化发起流程 ?? * 并且去掉批量设置联络人按钮，如需修改联络人，删除该标准重新走标准化发起流程 ??
*/ */
if (this.$route.query.taskId) { if (this.$route.query.processInstanceId) {
this.isRejectedTodo = true this.isRejectedTodo = true
} else { } else {
this.isRejectedTodo = false this.isRejectedTodo = false