FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-01-24 20:03:34 +08:00
parent 357874db8a 7031e0dc01
commit 04c9595a33
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+7 -12
View File
@@ -349,18 +349,13 @@
}}</a>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- show-overflow-tooltip-->
<!-- prop="standEnName"-->
<!-- label="英文名称"-->
<!-- min-width="300"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="dtqbbhbuss"
label="代替企标编号"
min-width="300"
>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -659,14 +659,14 @@
</el-select>
</el-form-item>-->
<!-- 体系类别-->
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- 责任工程师-->
<template>
<el-form-item