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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
danshihao
2023-11-22 13:52:15 +08:00
parent fa97fcf21b 73ec4f46ae
commit 706855b1cb
10 changed files with 462 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+20 -13
View File
@@ -54,14 +54,14 @@
<div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
<!-- 节点1、发起人发起 -->
<!-- 是联络人发起 -->
<contact-init-base-info v-if="currentNode === 1 && initRole === 'contact'" ref="baseInfoRef" @processNameChange="processNameChange"></contact-init-base-info>
<contact-init-base-info v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange"></contact-init-base-info>
<!-- 是标准化发起 -->
<standardization-init-base-info v-else-if="currentNode === 1 && initRole === 'standardization'" ref="baseInfoRef" @processNameChange="processNameChange"></standardization-init-base-info>
<standardization-init-base-info v-else-if="currentNode === 2" ref="baseInfoRef" @processNameChange="processNameChange"></standardization-init-base-info>
<!-- 节点2、起草人填写意见 -->
<drafter-enter-option-base-info v-else-if="currentNode === 2" ref="baseInfoRef"></drafter-enter-option-base-info>
<drafter-enter-option-base-info v-else-if="currentNode === 3" ref="baseInfoRef"></drafter-enter-option-base-info>
<!-- 节点3、起草人部长审批 -->
<!-- 节点4、标准化审批 -->
<recheck-approve-base-info v-else-if="currentNode === 3 || currentNode === 4" ref="baseInfoRef"></recheck-approve-base-info>
<recheck-approve-base-info v-else-if="currentNode === 4 || currentNode === 5" ref="baseInfoRef"></recheck-approve-base-info>
<!-- 流程审批信息 -->
<div class="process-part-title" v-if="!onlyLook">{{ $t('processApprovalInformation') }}</div>
@@ -163,18 +163,21 @@ export default {
// 初始化节点
const taskName = this.$route.query.taskName
if (taskName) {
if (taskName === '发起人发起') {
if (taskName === '标准化发起') {
// 发起人发起
this.currentNode = 1
} else if (taskName === '联络人发起') {
// 联络人发起
this.currentNode = 2
} else if (taskName === '起草人填写意见') {
// 起草人填写意见
this.currentNode = 2
this.currentNode = 3
} else if (taskName === '起草人部长审批') {
// 起草人部长审批
this.currentNode = 3
this.currentNode = 4
} else if (taskName === '标准化审批') {
// 标准化审批
this.currentNode = 4
this.currentNode = 5
} else {
// 预留加签节点
this.currentNode = 999
@@ -184,10 +187,8 @@ export default {
this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value, () => {
// 获取完人员信息结构，初始化人员信息是否可更改
if (this.$route.query.processInstanceId) {
if (this.currentNode === 1) {
if (this.currentNode === 1 || this.currentNode === 2) {
this.disabled = false
// 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
this.initRole = 'contact'
this.initPersonInfoData(true)
} else {
this.disabled = true
@@ -201,7 +202,14 @@ export default {
// 有流程id说明是从流程中心来的，需要初始化数据
this.getProcessData(this.$route.query.taskId)
} else {
this.currentNodeName = '发起人发起'
this.currentNodeName = '联络人发起'
}
if (this.$route.query.recheckPlanId) {
this.$nextTick(() => {
// 说明是从企标复审计划页面发起跳转过来的
this.$refs.baseInfoRef.formInline.recheckPlanId = this.$route.query.recheckPlanId
this.$refs.baseInfoRef.setFormById(this.$route.query.recheckPlanId)
})
}
// 如果是查看进入的，不可编辑，不可操作
if (this.$route.query.onlyLook) {
@@ -217,7 +225,6 @@ export default {
onlyLook: false, // 是否仅查看
currentNode: 1, // 当前节点
currentNodeName: '',
initRole: 'standardization', // 发起角色，发起的时候角色不一样表单不一样，contact联络人发起，standardization标准化发起
model: {},
processInfoForm: this.$form.createForm(this),
labelCol: {
src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
+50 -18
View File
@@ -11,12 +11,12 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
</span>
</div>
<a-form-model-item class="item-model" prop="standardNumber">
<standard-selection :source="StandardSource.ENTERPRISE.value"
<a-form-model-item class="item-model" prop="recheckPlanId">
<enterprise-recheck-plan-selection
:disabled="disabled"
:disabledSourceSearch="true"
type="radio"
v-model="formInline.standardNumber"
v-model="formInline.recheckPlanId"
:standardNumber="formInline.standardNumber"
@listChange="listChange" />
</a-form-model-item>
</div>
@@ -122,12 +122,15 @@
<script>
import { StandardSource } from '@/enums/commonEnums'
import StandardSelection from '@/components/selection/StandardSelection'
import EnterpriseRecheckPlanSelection from '@/components/selection/EnterpriseRecheckPlanSelection'
import UserSelection from '@/components/selection/UserSelection'
import { getEnterpriseStandardInfoById } from '@/api/enterpriseStandardLibraryApi'
import {
getEnterpriseStandardInfoById,
getEnterpriseRecheckPlanById
} from '@/api/enterpriseStandardLibraryApi'
export default {
name: 'ContactInitBaseInfo',
components: { StandardSelection, UserSelection },
components: { EnterpriseRecheckPlanSelection, UserSelection },
props: {
disabled: {
type: Boolean,
@@ -142,7 +145,7 @@ export default {
formInline: {},
rules: {
// 企标编号
standardNumber: [
recheckPlanId: [
{
required: true,
message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
@@ -177,26 +180,55 @@ export default {
})
return data
},
// 设置表单值，根据id
setFormById (recheckPlanId) {
this.loadind = true
getEnterpriseRecheckPlanById({ id: recheckPlanId }).then(res => {
if (res.success) {
const result = res.result
// 企标编号
this.formInline.standardNumber = result.standardNo
// 企标名称
this.formInline.standardName = result.standardName
// 发布日期
this.formInline.releaseDate = result.releaseDate
// 主起草人
this.formInline.mainDraftingUser = result.mainDraftingUser
this.formInline.mainDraftingUser_dictText = result.mainDraftingUser_dictText
// 主起草单位
this.formInline.mainDraftingUnit = result.mainDraftingUnit
// 复审日期
this.formInline.recheckDate = result.recheckDate
// 实施日期
this.formInline.implementationDate = result.implementationDate
}
}).finally(() => {
this.loading = false
})
this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审')
},
// 选完企标编号了，需要回显内容,返回流程名称
listChange (value) {
console.log(value)
this.loading = true
// 企标编号
this.formInline.standardNumber = value[0].standardNo
// 企标名称
this.formInline.standardName = value[0].standardName
getEnterpriseStandardInfoById({ id: value[0].id, type: '2' }).then(res => {
// 发布日期
this.formInline.releaseDate = value[0].releaseDate
// 主起草人
this.formInline.mainDraftingUser = value[0].mainDraftingUser
this.formInline.mainDraftingUser_dictText = value[0].mainDraftingUser_dictText
// 主起草单位
this.formInline.mainDraftingUnit = value[0].mainDraftingUnit
// 复审日期
this.formInline.recheckDate = value[0].recheckDate
getEnterpriseStandardInfoById({ standardNumber: value[0].standardNo, type: '2' }).then(res => {
if (res.success) {
const result = res.result
// 发布日期
this.formInline.releaseDate = result.release_date
// 实施日期
this.formInline.implementationDate = result.implementation_date
// 主起草人
this.formInline.mainDraftingUser = result.main_drafting_user
this.formInline.mainDraftingUser_dictText = result.main_drafting_user_dictText
// 主起草单位
this.formInline.mainDraftingUnit = result.main_drafting_unit
// 复审日期??
this.formInline = Object.assign({}, this.formInline)
}
}).finally(() => {
this.loading = false
src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
+7 -6
View File
@@ -11,11 +11,11 @@
</span>
</div>
<a-form-model-item class="item-model" prop="standardNumber">
<standard-selection :source="StandardSource.ENTERPRISE.value"
<enterprise-recheck-plan-selection
:disabled="disabled"
:disabledSourceSearch="true"
type="radio"
v-model="formInline.standardNumber"
:standardNumber="formInline.standardNumber"
@listChange="listChange" />
</a-form-model-item>
</div>
@@ -59,12 +59,12 @@
<script>
import { StandardSource } from '@/enums/commonEnums'
import StandardSelection from '@/components/selection/StandardSelection'
import UserSelection from '@/components/selection/UserSelection'
import EnterpriseRecheckPlanSelection from '@/components/selection/EnterpriseRecheckPlanSelection'
export default {
name: 'StandardizationInitBaseInfo',
components: { StandardSelection, UserSelection },
components: { EnterpriseRecheckPlanSelection, UserSelection },
props: {
disabled: {
type: Boolean,
@@ -78,7 +78,7 @@ export default {
formInline: {},
rules: {
// 企标编号
standardNumber: [
recheckPlanId: [
{
required: true,
message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
@@ -127,7 +127,8 @@ export default {
// 企标名称
this.formInline.standardName = value[0].standardName
// 主起草人赋值给联络人
// this.formInline.contactPerson = value[0].
this.formInline.contactPerson = value[0].mainDraftingUser
this.formInline.contactPerson_dictText = value[0].mainDraftingUser_dictText
this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审')
},
// 选择用户得到用户名