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