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:
yanyizhou
2021-09-03 20:32:07 +08:00
parent 8efe4c5a81 1dabab9fd4
commit abdef11637
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+1 -1
View File
@@ -95,7 +95,7 @@ export default {
allowType: {
type: Array,
default: () => {
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.jpg','.JPG','.jpeg','.JPEG', '.PNG', '.png', '.xls','.XLS', '.xlsx','.XLSX']
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX']
}
},
// 栅格比例
src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+12 -12
View File
@@ -35,17 +35,17 @@
<div class="search-area">
<div class="left">
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
<el-form-item label="数据来源" class="search-item">
<el-select v-model="replaceLawsNumForm.dataSource" filterable>
<el-option
v-for="item in dataSourceOptions"
:key="item.value"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="数据来源" class="search-item">-->
<!-- <el-select v-model="replaceLawsNumForm.dataSource" filterable>-->
<!-- <el-option-->
<!-- v-for="item in dataSourceOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="企标编号/标准名称" class="search-item input-width">
<el-input
v-model="replaceLawsNumForm.numberName"
@@ -125,7 +125,7 @@
</el-table-column>
<el-table-column
prop="standStateShow"
label="标准状态"
label="文本状态"
width="130">
</el-table-column>
</el-table>