|
|
@@ -39,8 +39,9 @@
|
|
|
<a-col :lg="8" :md="12" :sm="24" :xl="6" :xs="24">
|
|
|
<a-form-item :label="$t('plan.dvp.test-source')">
|
|
|
<a-select v-model="queryParam.testSource" :placeholder="$t('plan.dvp.please-enter-test-source')" allowClear>
|
|
|
- <a-select-option :value="0">{{ $t('plan.dvp.test-source-dvp-template') }}</a-select-option>
|
|
|
- <a-select-option :value="1">{{ $t('plan.dvp.test-source-DFMEA') }}</a-select-option>
|
|
|
+ <a-select-option v-for="item in testSourceList" :value="item.value">
|
|
|
+ {{ item.label }}
|
|
|
+ </a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
@@ -57,12 +58,12 @@
|
|
|
<a-range-picker v-model="queryParam.testEndTime" @change="changeEndTime" allowClear valueFormat="YYYY-MM-DD" style="width: 100%" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <!-- 试验结果 -->
|
|
|
+ <!-- 是否通过 -->
|
|
|
<a-col :lg="8" :md="12" :sm="24" :xl="6" :xs="24">
|
|
|
- <a-form-item :label="$t('verity.dvp.test.result')">
|
|
|
- <a-select v-model="queryParam.testResult" :placeholder="$t('global-btn.please-select') + $t('verity.dvp.test.result')" allowClear>
|
|
|
- <a-select-option :value="0">{{ $t('global-btn.pass') }}</a-select-option>
|
|
|
- <a-select-option :value="1">{{ $t('global-btn.fail') }}</a-select-option>
|
|
|
+ <a-form-item :label="$t('verity.dvp.is.pass')">
|
|
|
+ <a-select v-model="queryParam.testResult" :placeholder="$t('global-btn.please-select') + $t('verity.dvp.is.pass')" allowClear>
|
|
|
+ <a-select-option :value="1">{{ $t('global-btn.pass') }}</a-select-option>
|
|
|
+ <a-select-option :value="0">{{ $t('global-btn.fail') }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
@@ -465,11 +466,11 @@ export default {
|
|
|
ellipsis: true,
|
|
|
customRender: val => {
|
|
|
if( val == 0 ) {
|
|
|
- return "N"
|
|
|
+ return this.$t('global-btn.fail');
|
|
|
} else if ( val == 1) {
|
|
|
- return "Y"
|
|
|
+ return this.$t('global-btn.pass');
|
|
|
} else {
|
|
|
- return "N"
|
|
|
+ return this.$t('global-btn.fail');
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -500,12 +501,12 @@ export default {
|
|
|
dataIndex: 'materialsReportId',
|
|
|
ellipsis: true,
|
|
|
customRender: val => {
|
|
|
- return val === null ? "N" : "Y";
|
|
|
+ return val === null ? this.$t('global-btn.no') : this.$t('global-btn.yes');
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
// 测试结果及分析
|
|
|
- title: () => this.$t('verity.dvp.test.result'),
|
|
|
+ title: () => this.$t('verity.dvp.test.result.analysis'),
|
|
|
width: 150,
|
|
|
align: 'center',
|
|
|
dataIndex: 'testResultAnalyse',
|
