[update] 修改外来标准,定时任务不显示状态

This commit is contained in:
lideqin
2024-06-19 16:49:13 +08:00
parent 21d72188ea
commit db6ef3d3a2
8 changed files with 16 additions and 16 deletions
+1
View File
@@ -543,6 +543,7 @@ module.exports = {
standardNumber: 'Standard number', standardNumber: 'Standard number',
standardName: 'Standard name', standardName: 'Standard name',
releaseDate: 'Release date', releaseDate: 'Release date',
materialDate: 'Implementation date',
textState: 'Text state', textState: 'Text state',
evaluationState: 'Evaluation state' evaluationState: 'Evaluation state'
}, },
+1
View File
@@ -606,6 +606,7 @@ module.exports = {
standardNumber: '标准编号', standardNumber: '标准编号',
standardName: '标准名称', standardName: '标准名称',
releaseDate: '发布日期', releaseDate: '发布日期',
materialDate: '实施日期',
textState: '标准状态', textState: '标准状态',
evaluationState: '评估状态' evaluationState: '评估状态'
}, },
@@ -97,7 +97,7 @@ export default {
type: [String, Array], type: [String, Array],
required: false, required: false,
default: () => { default: () => {
return [StandardSource.DOMESTIC.value, StandardSource.OVERSEAS.value, StandardSource.ENTERPRISE.value] return [StandardSource.FOREIGN.value, StandardSource.ENTERPRISE.value]
} }
}, },
value: { value: {
@@ -172,10 +172,10 @@ export default {
width: 150, width: 150,
scopedSlots: { customRender: 'toDetail' } scopedSlots: { customRender: 'toDetail' }
}, },
// 发布日期 // 实施日期
{ {
title: this.$t('standardSelect.releaseDate'), title: this.$t('standardSelect.materialDate'),
dataIndex: 'releaseDate', dataIndex: 'implementationDate',
align: 'center', align: 'center',
width: 120, width: 120,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
+2 -4
View File
@@ -58,10 +58,8 @@ export const ProjectSource = {
// 标准来源 // 标准来源
export const StandardSource = { export const StandardSource = {
DOMESTIC: { text: '国内', value: '1' }, FOREIGN: { text: '外来标准', value: '1' },
OVERSEAS: { text: '海外', value: '2' }, ENTERPRISE: { text: '企标', value: '3' }
ENTERPRISE: { text: '企标', value: '3' },
FOREIGN: { text: '外来标准', value: '4' }
} }
// 动态分类 // 动态分类
@@ -647,7 +647,7 @@ export default {
this.$router.push({ this.$router.push({
path: '/workCenter/StandardEntryOrChangeProcess', path: '/workCenter/StandardEntryOrChangeProcess',
query: { query: {
source: StandardSource.Foreign.value, // 国内标准 source: StandardSource.Foreign.value, // 外来标准
operateType: OperationType.ENTRY.value // 入库 operateType: OperationType.ENTRY.value // 入库
} }
}) })
@@ -662,7 +662,7 @@ export default {
this.$router.push({ this.$router.push({
path: '/workCenter/StandardEntryOrChangeProcess', path: '/workCenter/StandardEntryOrChangeProcess',
query: { query: {
source: StandardSource.Foreign.value, // 国内标准 source: StandardSource.Foreign.value, // 外来标准
operateType: OperationType.CHANGE.value, // 变更 operateType: OperationType.CHANGE.value, // 变更
standardId: record.id // 标准id standardId: record.id // 标准id
} }
@@ -21,7 +21,7 @@
:disabled-field-list="disabledField" :disabled-field-list="disabledField"
:open-selected-all-field-list="openSelectedAllFieldList" :open-selected-all-field-list="openSelectedAllFieldList"
:exclude-standard-fields="excludeStandardFields" :exclude-standard-fields="excludeStandardFields"
:flag-by-field="{associated_foreign_standards: StandardSource.OVERSEAS.value}" :flag-by-field="{associated_foreign_standards: StandardSource.FOREIGN.value}"
@submitFormData="submitFormData" /> @submitFormData="submitFormData" />
</a-spin> </a-spin>
</div> </div>
@@ -129,10 +129,10 @@ export default {
width: 150, width: 150,
scopedSlots: { customRender: 'detail' } scopedSlots: { customRender: 'detail' }
}, },
// 发布日期 // 实施日期
{ {
title: this.$t('standardSelect.releaseDate'), title: this.$t('standardSelect.materialDate'),
dataIndex: 'releaseDate', dataIndex: 'implementationDate',
align: 'center', align: 'center',
width: 120, width: 120,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
+2 -2
View File
@@ -95,8 +95,8 @@
<!-- 状态渲染模板 --> <!-- 状态渲染模板 -->
<template slot="customRenderStatus" slot-scope="status"> <template slot="customRenderStatus" slot-scope="status">
<a-tag v-if="status==='0'" color="green">已启动</a-tag> <a-tag v-if="status + '' ==='0'" color="green">已启动</a-tag>
<a-tag v-if="status==='-1'" color="orange">已暂停</a-tag> <a-tag v-if="status + '' ==='-1'" color="orange">已暂停</a-tag>
</template> </template>
</a-table> </a-table>
</div> </div>