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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-12-08 16:09:12 +08:00
parent 0182634e35 0d1d70a3d2
commit 4d0c892c84
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+6 -8
View File
@@ -14,12 +14,12 @@
placeholder="标准/政策名称查找" placeholder="标准/政策名称查找"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="类型" class="search-item search-item-last"> <!-- <el-form-item label="类型" class="search-item search-item-last">-->
<el-select v-model="sarProject.position" placeholder="请选择标准性质"> <!-- <el-select v-model="sarProject.position" placeholder="请选择标准性质">-->
<el-option value="1" label="国内"></el-option> <!-- <el-option value="1" label="国内"></el-option>-->
<el-option value="2" label="海外"></el-option> <!-- <el-option value="2" label="海外"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
</el-form-item> </el-form-item>
@@ -173,7 +173,6 @@
style="width: 100%" style="width: 100%"
border border
:height="sarProStateTableHeight" :height="sarProStateTableHeight"
:default-sort = "{prop: 'specificItem', order: 'ascending'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
@@ -201,7 +200,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="specificItem" prop="specificItem"
sortable
label="具体章条"> label="具体章条">
</el-table-column> </el-table-column>
<el-table-column <el-table-column