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:
zhaokaiyao@91isoft.com
2021-09-17 17:05:00 +08:00
parent 7b1c80d46e 1ab7728f77
commit be9b84abe2
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+10 -2
View File
@@ -7,7 +7,7 @@
<div class="search-area">
<div class="left">
<el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
label-width="80px">
label-width="100px">
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
@@ -42,7 +42,7 @@
></el-input>
</el-form-item>
<br/><br/>
<el-form-item label="附件" prop="relateFile" class="search-item">
<el-form-item label="清单说明附件" prop="relateFile" class="search-item">
<el-upload
ref="relevantFile"
:action="uploadFileListPath"
@@ -278,6 +278,14 @@
width="55"
align="center">
</el-table-column>
<el-table-column
label="序号"
align="center"
width="55"
fixed="left"
type="index"
>
</el-table-column>
<el-table-column
prop="code"
show-overflow-tooltip
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+10 -2
View File
@@ -25,7 +25,7 @@
<span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span>
</p>
<div class="transition-box-p">
<label class="transition-box-label">附件：</label>
<label class="transition-box-label">清单说明附件：</label>
<div class="file-box" v-if="fileInfoList.length > 0">
<p v-for="item in fileInfoList"
:key="item.id"> {{ item.name }}
@@ -109,6 +109,14 @@
width="55"
align="center">
</el-table-column>
<el-table-column
label="序号"
align="center"
width="55"
fixed="left"
type="index"
>
</el-table-column>
<el-table-column
prop="standNumber"
fixed="left"
@@ -849,7 +857,7 @@ export default {
.transition-box-label {
display: inline-block;
width: 80px;
width: 100px;
vertical-align: top;
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+10 -2
View File
@@ -6,7 +6,7 @@
<el-divider content-position="left">基础信息</el-divider>
<div class="search-area">
<div class="left">
<el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
<el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="100px">
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
@@ -26,7 +26,7 @@
></el-input>
</el-form-item>
<br/><br/>
<el-form-item label="附件" prop="relateFile" class="search-item">
<el-form-item label="清单说明附件" prop="relateFile" class="search-item">
<el-upload
ref="relevantFile"
:action="uploadFileListPath"
@@ -253,6 +253,14 @@
width="55"
align="center">
</el-table-column>
<el-table-column
label="序号"
align="center"
width="55"
fixed="left"
type="index"
>
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+10 -2
View File
@@ -7,7 +7,7 @@
<div class="search-area">
<div class="left">
<el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
label-width="80px">
label-width="100px">
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
@@ -39,7 +39,7 @@
></el-input>
</el-form-item>
<br/><br/>
<el-form-item label="附件" prop="relateFile" class="search-item">
<el-form-item label="清单说明附件" prop="relateFile" class="search-item">
<el-upload
ref="relevantFile"
:action="uploadFileListPath"
@@ -311,6 +311,14 @@
width="55"
align="center">
</el-table-column>
<el-table-column
label="序号"
align="center"
width="55"
fixed="left"
type="index"
>
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip